diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2008-02-23 18:23:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-23 20:12:13 -0500 |
| commit | c3be10f75757e681b34766b24264c83b5ba08041 (patch) | |
| tree | 7675511c9d6021440e884c7137f4136c539b1c98 /arch/um | |
| parent | 7b59ebcd178b5b1d03760c89b318c7a7fdadd051 (diff) | |
arch/um/kernel/mem.c: fix a shadowed variable
Fix a shadowed variable in arch/um/kernel/mem.c, since there is a global
variable has the same name.
Cc: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/kernel/mem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index 2627ce82e918..2eea1ff235e6 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c | |||
| @@ -299,7 +299,7 @@ void show_mem(void) | |||
| 299 | { | 299 | { |
| 300 | int pfn, total = 0, reserved = 0; | 300 | int pfn, total = 0, reserved = 0; |
| 301 | int shared = 0, cached = 0; | 301 | int shared = 0, cached = 0; |
| 302 | int highmem = 0; | 302 | int high_mem = 0; |
| 303 | struct page *page; | 303 | struct page *page; |
| 304 | 304 | ||
| 305 | printk(KERN_INFO "Mem-info:\n"); | 305 | printk(KERN_INFO "Mem-info:\n"); |
| @@ -311,7 +311,7 @@ void show_mem(void) | |||
| 311 | page = pfn_to_page(pfn); | 311 | page = pfn_to_page(pfn); |
| 312 | total++; | 312 | total++; |
| 313 | if (PageHighMem(page)) | 313 | if (PageHighMem(page)) |
| 314 | highmem++; | 314 | high_mem++; |
| 315 | if (PageReserved(page)) | 315 | if (PageReserved(page)) |
| 316 | reserved++; | 316 | reserved++; |
| 317 | else if (PageSwapCache(page)) | 317 | else if (PageSwapCache(page)) |
| @@ -320,7 +320,7 @@ void show_mem(void) | |||
| 320 | shared += page_count(page) - 1; | 320 | shared += page_count(page) - 1; |
| 321 | } | 321 | } |
| 322 | printk(KERN_INFO "%d pages of RAM\n", total); | 322 | printk(KERN_INFO "%d pages of RAM\n", total); |
| 323 | printk(KERN_INFO "%d pages of HIGHMEM\n", highmem); | 323 | printk(KERN_INFO "%d pages of HIGHMEM\n", high_mem); |
| 324 | printk(KERN_INFO "%d reserved pages\n", reserved); | 324 | printk(KERN_INFO "%d reserved pages\n", reserved); |
| 325 | printk(KERN_INFO "%d pages shared\n", shared); | 325 | printk(KERN_INFO "%d pages shared\n", shared); |
| 326 | printk(KERN_INFO "%d pages swap cached\n", cached); | 326 | printk(KERN_INFO "%d pages swap cached\n", cached); |
