Merge branch 'x86/urgent' into x86-mm

[~andy/linux] / include / linux / proc_fs.h

diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 379eaed72d4b447d7e3b5098ab48e65d7bd959f9..838c1149251a1e8edff75dd2db6ef58092542386 100644 (file)
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -50,7 +50,7 @@ typedef       int (write_proc_t)(struct file *file, const char __user *buffer,
 
 struct proc_dir_entry {
        unsigned int low_ino;
-       unsigned short namelen;
+       unsigned int namelen;
        const char *name;
        mode_t mode;
        nlink_t nlink;