1 files changed, 4 insertions, 2 deletions

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 982e44f960d..16be6dc14db 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -73,7 +73,7 @@
 
 #include <asm/mtrr.h>
 #include <asm/apic.h>
-#include <asm/trampoline.h>
+#include <asm/realmode.h>
 #include <asm/e820.h>
 #include <asm/mpspec.h>
 #include <asm/setup.h>
@@ -909,7 +909,7 @@ void __init setup_arch(char **cmdline_p)
         printk(KERN_DEBUG "initial memory mapped: [mem 0x00000000-%#010lx]\n",
                         (max_pfn_mapped<<PAGE_SHIFT) - 1);
 
-        setup_trampolines();
+        setup_real_mode();
 
         init_gbpages();
 
@@ -968,6 +968,8 @@ void __init setup_arch(char **cmdline_p)
         if (boot_cpu_data.cpuid_level >= 0) {
                 /* A CPU has %cr4 if and only if it has CPUID */
                 mmu_cr4_features = read_cr4();
+                if (trampoline_cr4_features)
+                        *trampoline_cr4_features = mmu_cr4_features;
         }
 
 #ifdef CONFIG_X86_32