diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /arch/unicore32/mm/init.c | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'arch/unicore32/mm/init.c')
| -rw-r--r-- | arch/unicore32/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/unicore32/mm/init.c b/arch/unicore32/mm/init.c index 3dbe3709b69..1fc02633f70 100644 --- a/arch/unicore32/mm/init.c +++ b/arch/unicore32/mm/init.c | |||
| @@ -55,7 +55,7 @@ early_param("initrd", early_initrd); | |||
| 55 | */ | 55 | */ |
| 56 | struct meminfo meminfo; | 56 | struct meminfo meminfo; |
| 57 | 57 | ||
| 58 | void show_mem(void) | 58 | void show_mem(unsigned int filter) |
| 59 | { | 59 | { |
| 60 | int free = 0, total = 0, reserved = 0; | 60 | int free = 0, total = 0, reserved = 0; |
| 61 | int shared = 0, cached = 0, slab = 0, i; | 61 | int shared = 0, cached = 0, slab = 0, i; |