2 files changed, 4 insertions, 4 deletions

diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c
index fa015565001b..d386c75c88eb 100644
--- a/arch/um/kernel/initrd.c
+++ b/arch/um/kernel/initrd.c
@@ -32,7 +32,7 @@ static int __init read_initrd(void)
          * ask for no memory.
          */
         if (size == 0) {
-                printk(KERN_ERR "\"%\" is a zero-size initrd\n");
+                printk(KERN_ERR "\"%s\" is a zero-size initrd\n", initrd);
                 return 0;
         }
 
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)
 {
         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");
@@ -311,7 +311,7 @@ void show_mem(void)
                 page = pfn_to_page(pfn);
                 total++;
                 if (PageHighMem(page))
-                        highmem++;
+                        high_mem++;
                 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);
-        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);