Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / arch / tile / kernel / setup.c

diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index 7a5aa1a..68b5426 100644 (file)
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -307,8 +307,8 @@ static void __cpuinit store_permanent_mappings(void)
                hv_store_mapping(addr, pages << PAGE_SHIFT, pa);
        }
 
-       hv_store_mapping((HV_VirtAddr)_stext,
-                        (uint32_t)(_einittext - _stext), 0);
+       hv_store_mapping((HV_VirtAddr)_text,
+                        (uint32_t)(_einittext - _text), 0);
 }
 
 /*
@@ -329,6 +329,7 @@ static void __init setup_memory(void)
 #if defined(CONFIG_HIGHMEM) || defined(__tilegx__)
        long lowmem_pages;
 #endif
+       unsigned long physpages = 0;
 
        /* We are using a char to hold the cpu_2_node[] mapping */
        BUILD_BUG_ON(MAX_NUMNODES > 127);
@@ -388,8 +389,8 @@ static void __init setup_memory(void)
                                continue;
                        }
                }
-               if (num_physpages + PFN_DOWN(range.size) > maxmem_pfn) {
-                       int max_size = maxmem_pfn - num_physpages;
+               if (physpages + PFN_DOWN(range.size) > maxmem_pfn) {
+                       int max_size = maxmem_pfn - physpages;
                        if (max_size > 0) {
                                pr_err("Maxmem reduced node %d to %d pages\n",
                                       i, max_size);
@@ -446,7 +447,7 @@ static void __init setup_memory(void)
                node_start_pfn[i] = start;
                node_end_pfn[i] = end;
                node_controller[i] = range.controller;
-               num_physpages += size;
+               physpages += size;
                max_pfn = end;
 
                /* Mark node as online */
@@ -465,7 +466,7 @@ static void __init setup_memory(void)
         * we're willing to use at 8 million pages (32GB of 4KB pages).
         */
        cap = 8 * 1024 * 1024;  /* 8 million pages */
-       if (num_physpages > cap) {
+       if (physpages > cap) {
                int num_nodes = num_online_nodes();
                int cap_each = cap / num_nodes;
                unsigned long dropped_pages = 0;
@@ -476,10 +477,10 @@ static void __init setup_memory(void)
                                node_end_pfn[i] = node_start_pfn[i] + cap_each;
                        }
                }
-               num_physpages -= dropped_pages;
+               physpages -= dropped_pages;
                pr_warning("Only using %ldMB memory;"
                       " ignoring %ldMB.\n",
-                      num_physpages >> (20 - PAGE_SHIFT),
+                      physpages >> (20 - PAGE_SHIFT),
                       dropped_pages >> (20 - PAGE_SHIFT));
                pr_warning("Consider using a larger page size.\n");
        }
@@ -497,7 +498,7 @@ static void __init setup_memory(void)
 
        lowmem_pages = (mappable_physpages > MAXMEM_PFN) ?
                MAXMEM_PFN : mappable_physpages;
-       highmem_pages = (long) (num_physpages - lowmem_pages);
+       highmem_pages = (long) (physpages - lowmem_pages);
 
        pr_notice("%ldMB HIGHMEM available.\n",
               pages_to_mb(highmem_pages > 0 ? highmem_pages : 0));
@@ -514,7 +515,6 @@ static void __init setup_memory(void)
                pr_warning("Use a HIGHMEM enabled kernel.\n");
                max_low_pfn = MAXMEM_PFN;
                max_pfn = MAXMEM_PFN;
-               num_physpages = MAXMEM_PFN;
                node_end_pfn[0] = MAXMEM_PFN;
        } else {
                pr_notice("%ldMB memory available.\n",