arch/um/kernel/mem.c: fix a shadowed variable
authorWANG Cong <xiyou.wangcong@gmail.com>
Sat, 23 Feb 2008 23:23:26 +0000 (15:23 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 24 Feb 2008 01:12:13 +0000 (17:12 -0800)
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>
arch/um/kernel/mem.c

index 2627ce82e918887f2fdf4ad9d9031fd4d6ac26ad..2eea1ff235e6c2cac17b80fdc343f2a9394f52d4 100644 (file)
@@ -299,7 +299,7 @@ void show_mem(void)
 {
        int pfn, total = 0, reserved = 0;
        int shared = 0, cached = 0;
 {
        int pfn, total = 0, reserved = 0;
        int shared = 0, cached = 0;
-       int highmem = 0;
+       int high_mem = 0;
        struct page *page;
 
        printk(KERN_INFO "Mem-info:\n");
        struct page *page;
 
        printk(KERN_INFO "Mem-info:\n");
@@ -311,7 +311,7 @@ void show_mem(void)
                page = pfn_to_page(pfn);
                total++;
                if (PageHighMem(page))
                page = pfn_to_page(pfn);
                total++;
                if (PageHighMem(page))
-                       highmem++;
+                       high_mem++;
                if (PageReserved(page))
                        reserved++;
                else if (PageSwapCache(page))
                if (PageReserved(page))
                        reserved++;
                else if (PageSwapCache(page))
@@ -320,7 +320,7 @@ void show_mem(void)
                        shared += page_count(page) - 1;
        }
        printk(KERN_INFO "%d pages of RAM\n", total);
                        shared += page_count(page) - 1;
        }
        printk(KERN_INFO "%d pages of RAM\n", total);
-       printk(KERN_INFO "%d pages of HIGHMEM\n", highmem);
+       printk(KERN_INFO "%d pages of HIGHMEM\n", high_mem);
        printk(KERN_INFO "%d reserved pages\n", reserved);
        printk(KERN_INFO "%d pages shared\n", shared);
        printk(KERN_INFO "%d pages swap cached\n", cached);
        printk(KERN_INFO "%d reserved pages\n", reserved);
        printk(KERN_INFO "%d pages shared\n", shared);
        printk(KERN_INFO "%d pages swap cached\n", cached);