Merge remote-tracking branch 'origin/x86/mm' into x86/mm2

Explicitly merging these two branches due to nontrivial conflicts and
to allow further work.

Resolved Conflicts:
	arch/x86/kernel/head32.c
	arch/x86/kernel/head64.c
	arch/x86/mm/init_64.c
	arch/x86/realmode/init.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
index 4b5bdc8c8710..a44f457e70a1 100644
--- a/arch/x86/realmode/init.c
+++ b/arch/x86/realmode/init.c
@@ -70,9 +70,9 @@ void __init setup_real_mode(void)
                 __va(real_mode_header->trampoline_header);
 
 #ifdef CONFIG_X86_32
-        trampoline_header->start = __pa(startup_32_smp);
+        trampoline_header->start = __pa_symbol(startup_32_smp);
         trampoline_header->gdt_limit = __BOOT_DS + 7;
-        trampoline_header->gdt_base = __pa(boot_gdt);
+        trampoline_header->gdt_base = __pa_symbol(boot_gdt);
 #else
         /*
          * Some AMD processors will #GP(0) if EFER.LMA is set in WRMSR