Merge branch 'linus' into x86/urgent

Merge reason: We want to queue up a dependent fix.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 5 insertions, 21 deletions

diff --git a/arch/x86/kernel/trampoline.c b/arch/x86/kernel/trampoline.c
index e2a595257390..a375616d77f7 100644
--- a/arch/x86/kernel/trampoline.c
+++ b/arch/x86/kernel/trampoline.c
@@ -1,8 +1,8 @@
 #include <linux/io.h>
+#include <linux/memblock.h>
 
 #include <asm/trampoline.h>
 #include <asm/pgtable.h>
-#include <asm/e820.h>
 
 #if defined(CONFIG_X86_64) && defined(CONFIG_ACPI_SLEEP)
 #define __trampinit
@@ -17,15 +17,15 @@ unsigned char *__trampinitdata trampoline_base;
 
 void __init reserve_trampoline_memory(void)
 {
-        unsigned long mem;
+        phys_addr_t mem;
 
         /* Has to be in very low memory so we can execute real-mode AP code. */
-        mem = find_e820_area(0, 1<<20, TRAMPOLINE_SIZE, PAGE_SIZE);
-        if (mem == -1L)
+        mem = memblock_find_in_range(0, 1<<20, TRAMPOLINE_SIZE, PAGE_SIZE);
+        if (mem == MEMBLOCK_ERROR)
                 panic("Cannot allocate trampoline\n");
 
         trampoline_base = __va(mem);
-        reserve_early(mem, mem + TRAMPOLINE_SIZE, "TRAMPOLINE");
+        memblock_x86_reserve_range(mem, mem + TRAMPOLINE_SIZE, "TRAMPOLINE");
 }
 
 /*
@@ -38,19 +38,3 @@ unsigned long __trampinit setup_trampoline(void)
         memcpy(trampoline_base, trampoline_data, TRAMPOLINE_SIZE);
         return virt_to_phys(trampoline_base);
 }
-
-void __init setup_trampoline_page_table(void)
-{
-#ifdef CONFIG_X86_32
-        /* Copy kernel address range */
-        clone_pgd_range(trampoline_pg_dir + KERNEL_PGD_BOUNDARY,
-                        swapper_pg_dir + KERNEL_PGD_BOUNDARY,
-                        KERNEL_PGD_PTRS);
-
-        /* Initialize low mappings */
-        clone_pgd_range(trampoline_pg_dir,
-                        swapper_pg_dir + KERNEL_PGD_BOUNDARY,
-                        min_t(unsigned long, KERNEL_PGD_PTRS,
-                              KERNEL_PGD_BOUNDARY));
-#endif
-}