x86-64: remove dead debugging code for !pse setups

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / x86 / mm / init_64.c

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 474e28f..8c696c9 100644 (file)
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -1011,11 +1011,8 @@ remove_pagetable(unsigned long start, unsigned long end, bool direct)
        flush_tlb_all();
 }
 
-void __ref vmemmap_free(struct page *memmap, unsigned long nr_pages)
+void __ref vmemmap_free(unsigned long start, unsigned long end)
 {
-       unsigned long start = (unsigned long)memmap;
-       unsigned long end = (unsigned long)(memmap + nr_pages);
-
        remove_pagetable(start, end, false);
 }
 
@@ -1067,10 +1064,9 @@ void __init mem_init(void)
 
        /* clear_bss() already clear the empty_zero_page */
 
-       reservedpages = 0;
-
-       /* this will put all low memory onto the freelists */
        register_page_bootmem_info();
+
+       /* this will put all memory onto the freelists */
        totalram_pages = free_all_bootmem();
 
        absent_pages = absent_pages_in_range(0, max_pfn);
@@ -1285,17 +1281,15 @@ static long __meminitdata addr_start, addr_end;
 static void __meminitdata *p_start, *p_end;
 static int __meminitdata node_start;
 
-int __meminit
-vmemmap_populate(struct page *start_page, unsigned long size, int node)
+int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
 {
-       unsigned long addr = (unsigned long)start_page;
-       unsigned long end = (unsigned long)(start_page + size);
+       unsigned long addr;
        unsigned long next;
        pgd_t *pgd;
        pud_t *pud;
        pmd_t *pmd;
 
-       for (; addr < end; addr = next) {
+       for (addr = start; addr < end; addr = next) {
                void *p = NULL;
 
                pgd = vmemmap_pgd_populate(addr, node);
@@ -1317,9 +1311,6 @@ vmemmap_populate(struct page *start_page, unsigned long size, int node)
 
                        if (!p)
                                return -ENOMEM;
-
-                       addr_end = addr + PAGE_SIZE;
-                       p_end = p + PAGE_SIZE;
                } else {
                        next = pmd_addr_end(addr, end);
 
@@ -1352,7 +1343,7 @@ vmemmap_populate(struct page *start_page, unsigned long size, int node)
                }
 
        }
-       sync_global_pgds((unsigned long)start_page, end - 1);
+       sync_global_pgds(start, end - 1);
        return 0;
 }