diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 13:53:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 13:53:16 -0700 |
| commit | 74a205a3f1a07cf0b72bf7816d75735a0d9c4c6b (patch) | |
| tree | d977fe81c74a0728130c7e212f2c27eef8146e91 /fs/proc/base.c | |
| parent | dd26bf6d95f050c42cc8f15e750b09851e1fd30b (diff) | |
| parent | 912335c43bb10d124471bf063a85e132aa814214 (diff) | |
| download | linux-3.10-74a205a3f1a07cf0b72bf7816d75735a0d9c4c6b.tar.gz linux-3.10-74a205a3f1a07cf0b72bf7816d75735a0d9c4c6b.tar.bz2 linux-3.10-74a205a3f1a07cf0b72bf7816d75735a0d9c4c6b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
UIO: fix specific device driver missing statement for depmod
Driver core: remove pr_fmt() from dynamic_dev_dbg() printk
driver core: prevent device_for_each_child from oopsing
dynamic debug: resurrect old pr_debug() semantics as pr_devel()
Driver Core: early platform driver
proc: mounts_poll() make consistent to mdstat_poll
sysfs: sysfs poll keep the poll rule of regular file.
driver core: allow non-root users to listen to uevents
driver core: fix driver_match_device
sysfs: don't use global workqueue in sysfs_schedule_callback()
Diffstat (limited to 'fs/proc/base.c')
| -rw-r--r-- | fs/proc/base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index f71559784bf..aa763ab0077 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -648,14 +648,14 @@ static unsigned mounts_poll(struct file *file, poll_table *wait) { struct proc_mounts *p = file->private_data; struct mnt_namespace *ns = p->ns; - unsigned res = 0; + unsigned res = POLLIN | POLLRDNORM; poll_wait(file, &ns->poll, wait); spin_lock(&vfsmount_lock); if (p->event != ns->event) { p->event = ns->event; - res = POLLERR; + res |= POLLERR | POLLPRI; } spin_unlock(&vfsmount_lock); |