diff --git a/[refs] b/[refs] index be4d49a0c425..33535ce9854a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1af3557abdef34ee036a6de4cb79e24468544b8d +refs/heads/master: 31b07093c44a7a442394d44423e21d783f5523b8 diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index f71559784bfb..aa763ab00777 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/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);