diff options
| author | Pekka Enberg <penberg@kernel.org> | 2013-05-07 10:19:47 +0400 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2013-05-07 10:19:47 +0400 |
| commit | 69df2ac1288b456a95aceadafbf88cd891a577c8 (patch) | |
| tree | 0f2e83a8c4bc826f12d3f3871ecc1d7be0c9e4e3 /fs | |
| parent | c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 (diff) | |
| parent | 8a965b3baa89ffedc73c0fbc750006c631012ced (diff) | |
| download | linux-69df2ac1288b456a95aceadafbf88cd891a577c8.tar.xz | |
Merge branch 'slab/next' into slab/for-linus
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/stat.c | 2 |
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; |