Merge branch 'memblock-kill-early_node_map' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/memblock

3 files changed, 7 insertions, 14 deletions

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 1f928659c33..12eb07bfb26 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1215,8 +1215,6 @@ asmlinkage void __init xen_start_kernel(void)
         local_irq_disable();
         early_boot_irqs_disabled = true;
 
-        memblock_init();
-
         xen_raw_console_write("mapping kernel into physical memory\n");
         pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages);
         xen_ident_map_ISA();
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 87f6673b120..f4bf8aa574f 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -1774,10 +1774,8 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
         __xen_write_cr3(true, __pa(pgd));
         xen_mc_issue(PARAVIRT_LAZY_CPU);
 
-        memblock_x86_reserve_range(__pa(xen_start_info->pt_base),
-                      __pa(xen_start_info->pt_base +
-                           xen_start_info->nr_pt_frames * PAGE_SIZE),
-                      "XEN PAGETABLES");
+        memblock_reserve(__pa(xen_start_info->pt_base),
+                         xen_start_info->nr_pt_frames * PAGE_SIZE);
 
         return pgd;
 }
@@ -1853,10 +1851,8 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
                           PFN_DOWN(__pa(initial_page_table)));
         xen_write_cr3(__pa(initial_page_table));
 
-        memblock_x86_reserve_range(__pa(xen_start_info->pt_base),
-                      __pa(xen_start_info->pt_base +
-                           xen_start_info->nr_pt_frames * PAGE_SIZE),
-                      "XEN PAGETABLES");
+        memblock_reserve(__pa(xen_start_info->pt_base),
+                         xen_start_info->nr_pt_frames * PAGE_SIZE));
 
         return initial_page_table;
 }
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index b2c7179fa26..e03c6369217 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -75,7 +75,7 @@ static void __init xen_add_extra_mem(u64 start, u64 size)
         if (i == XEN_EXTRA_MEM_MAX_REGIONS)
                 printk(KERN_WARNING "Warning: not enough extra memory regions\n");
 
-        memblock_x86_reserve_range(start, start + size, "XEN EXTRA");
+        memblock_reserve(start, size);
 
         xen_max_p2m_pfn = PFN_DOWN(start + size);
 
@@ -311,9 +311,8 @@ char * __init xen_memory_setup(void)
          *  - xen_start_info
          * See comment above "struct start_info" in <xen/interface/xen.h>
          */
-        memblock_x86_reserve_range(__pa(xen_start_info->mfn_list),
-                      __pa(xen_start_info->pt_base),
-                        "XEN START INFO");
+        memblock_reserve(__pa(xen_start_info->mfn_list),
+                         xen_start_info->pt_base - xen_start_info->mfn_list);
 
         sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);