Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / fs / proc_namespace.c

diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index b786840facd96e8dbb3cb0ce76125d915bc0c916..c8528d587e09d3e856a39c848b998add4a29d7ed 100644 (file)
--- 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 = POLLIN | POLLRDNORM;
        int event;
 
        poll_wait(file, &p->ns->poll, wait);