X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=fs%2Fproc_namespace.c;h=e16fb8f2049e76dafdd533158fa534dc321d6dbc;hb=1fbf3e48123d701584bc75ccac67ef2fe412ac4c;hp=b786840facd96e8dbb3cb0ce76125d915bc0c916;hpb=535b218a7fc7f2918d54fe00e6d7ac385ced3502;p=linux-2.6-microblaze.git diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c index b786840facd9..e16fb8f2049e 100644 --- a/fs/proc_namespace.c +++ b/fs/proc_namespace.c @@ -18,12 +18,12 @@ #include "pnode.h" #include "internal.h" -static unsigned mounts_poll(struct file *file, poll_table *wait) +static __poll_t mounts_poll(struct file *file, poll_table *wait) { struct seq_file *m = file->private_data; struct proc_mounts *p = m->private; struct mnt_namespace *ns = p->ns; - unsigned res = POLLIN | POLLRDNORM; + __poll_t res = EPOLLIN | EPOLLRDNORM; int event; poll_wait(file, &p->ns->poll, wait); @@ -31,7 +31,7 @@ static unsigned mounts_poll(struct file *file, poll_table *wait) event = READ_ONCE(ns->event); if (m->poll_event != event) { m->poll_event = event; - res |= POLLERR | POLLPRI; + res |= EPOLLERR | EPOLLPRI; } return res;