1 files changed, 8 insertions, 7 deletions

diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index a5136474c6fd..ae3a6706419b 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -735,7 +735,7 @@ static void __init parse_cmdline_early(char *cmdline)
                 /* "mem=XXX[kKmM]" sets SDRAM size to <mem>, overriding the value we worked
                  * out from the SDRAM controller mask register
                  */
-                if (!memcmp(cmdline, "mem=", 4)) {
+                if (!strncmp(cmdline, "mem=", 4)) {
                         unsigned long long mem_size;
 
                         mem_size = memparse(cmdline + 4, &cmdline);
@@ -876,6 +876,7 @@ late_initcall(setup_arch_serial);
 static void __init setup_linux_memory(void)
 {
         unsigned long bootmap_size, low_top_pfn, kstart, kend, high_mem;
+        unsigned long physpages;
 
         kstart  = (unsigned long) &__kernel_image_start - PAGE_OFFSET;
         kend    = (unsigned long) &__kernel_image_end - PAGE_OFFSET;
@@ -893,19 +894,19 @@ static void __init setup_linux_memory(void)
                                          );
 
         /* pass the memory that the kernel can immediately use over to the bootmem allocator */
-        max_mapnr = num_physpages = (memory_end - memory_start) >> PAGE_SHIFT;
+        max_mapnr = physpages = (memory_end - memory_start) >> PAGE_SHIFT;
         low_top_pfn = (KERNEL_LOWMEM_END - KERNEL_LOWMEM_START) >> PAGE_SHIFT;
         high_mem = 0;
 
-        if (num_physpages > low_top_pfn) {
+        if (physpages > low_top_pfn) {
 #ifdef CONFIG_HIGHMEM
-                high_mem = num_physpages - low_top_pfn;
+                high_mem = physpages - low_top_pfn;
 #else
-                max_mapnr = num_physpages = low_top_pfn;
+                max_mapnr = physpages = low_top_pfn;
 #endif
         }
         else {
-                low_top_pfn = num_physpages;
+                low_top_pfn = physpages;
         }
 
         min_low_pfn = memory_start >> PAGE_SHIFT;
@@ -979,7 +980,7 @@ static void __init setup_uclinux_memory(void)
         free_bootmem(memory_start, memory_end - memory_start);
 
         high_memory = (void *) (memory_end & PAGE_MASK);
-        max_mapnr = num_physpages = ((unsigned long) high_memory - PAGE_OFFSET) >> PAGE_SHIFT;
+        max_mapnr = ((unsigned long) high_memory - PAGE_OFFSET) >> PAGE_SHIFT;
 
         min_low_pfn = memory_start >> PAGE_SHIFT;
         max_low_pfn = memory_end >> PAGE_SHIFT;