Merge branch 'slab/next' into slab/for-linus

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/proc/stat.c b/fs/proc/stat.c
index e296572c73ed..1cf86c0e8689 100644
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@ -184,7 +184,7 @@ static int show_stat(struct seq_file *p, void *v)
 
 static int stat_open(struct inode *inode, struct file *file)
 {
-        unsigned size = 1024 + 128 * num_possible_cpus();
+        size_t size = 1024 + 128 * num_possible_cpus();
         char *buf;
         struct seq_file *m;
         int res;