diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 13:43:54 (GMT) |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 13:43:54 (GMT) |
| commit | b160292cc216a50fd0cd386b0bda2cd48352c73b (patch) | |
| tree | ef07cf98f91353ee4c9ec1e1ca7a2a5d9d4b538a /fs/proc/inode.c | |
| parent | b37bde147890c8fea8369a5a4e230dabdea4ebfb (diff) | |
| parent | bbf25010f1a6b761914430f5fca081ec8c7accd1 (diff) | |
| download | linux-fsl-qoriq-b160292cc216a50fd0cd386b0bda2cd48352c73b.tar.xz | |
Merge Linux 2.6.23
Diffstat (limited to 'fs/proc/inode.c')
| -rw-r--r-- | fs/proc/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c index a5b0dfd..0e4d37c 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -11,6 +11,7 @@ #include <linux/string.h> #include <linux/stat.h> #include <linux/completion.h> +#include <linux/poll.h> #include <linux/file.h> #include <linux/limits.h> #include <linux/init.h> @@ -232,7 +233,7 @@ static ssize_t proc_reg_write(struct file *file, const char __user *buf, size_t static unsigned int proc_reg_poll(struct file *file, struct poll_table_struct *pts) { struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode); - unsigned int rv = 0; + unsigned int rv = DEFAULT_POLLMASK; unsigned int (*poll)(struct file *, struct poll_table_struct *); spin_lock(&pde->pde_unload_lock); |