← Back to branch summary

~ubuntu-branches/ubuntu/wily/linux-ti-omap4/wily

« back to all changes in this revision

Viewing changes to fs/proc/kmsg.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2013-07-11 18:35:20 UTC
  • Revision ID: package-import@ubuntu.com-20130711183520-htnf1x4y5r11hndr
Tags: 3.5.0-229.42
https://launchpad.net/bugs/1199276
* Release Tracking Bug
  - LP: #1199276

[ Paolo Pisati ]

* [Config] CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/proc/kmsg.c
21
21
 
22
22
static int kmsg_open(struct inode * inode, struct file * file)
23
23
{
24
 
        return do_syslog(SYSLOG_ACTION_OPEN, NULL, 0, SYSLOG_FROM_FILE);
 
24
        return do_syslog(SYSLOG_ACTION_OPEN, NULL, 0, SYSLOG_FROM_PROC);
25
25
}
26
26
 
27
27
static int kmsg_release(struct inode * inode, struct file * file)
28
28
{
29
 
        (void) do_syslog(SYSLOG_ACTION_CLOSE, NULL, 0, SYSLOG_FROM_FILE);
 
29
        (void) do_syslog(SYSLOG_ACTION_CLOSE, NULL, 0, SYSLOG_FROM_PROC);
30
30
        return 0;
31
31
}
32
32
 
34
34
                         size_t count, loff_t *ppos)
35
35
{
36
36
        if ((file->f_flags & O_NONBLOCK) &&
37
 
            !do_syslog(SYSLOG_ACTION_SIZE_UNREAD, NULL, 0, SYSLOG_FROM_FILE))
 
37
            !do_syslog(SYSLOG_ACTION_SIZE_UNREAD, NULL, 0, SYSLOG_FROM_PROC))
38
38
                return -EAGAIN;
39
 
        return do_syslog(SYSLOG_ACTION_READ, buf, count, SYSLOG_FROM_FILE);
 
39
        return do_syslog(SYSLOG_ACTION_READ, buf, count, SYSLOG_FROM_PROC);
40
40
}
41
41
 
42
42
static unsigned int kmsg_poll(struct file *file, poll_table *wait)
43
43
{
44
44
        poll_wait(file, &log_wait, wait);
45
 
        if (do_syslog(SYSLOG_ACTION_SIZE_UNREAD, NULL, 0, SYSLOG_FROM_FILE))
 
45
        if (do_syslog(SYSLOG_ACTION_SIZE_UNREAD, NULL, 0, SYSLOG_FROM_PROC))
46
46
                return POLLIN | POLLRDNORM;
47
47
        return 0;
48
48
}