Move source tree closer to the 2.6.32.17 mainline
/arch/x86/kernel/setup.c
blob:d7a08884993893d4010311b0228956d21baa1089 -> blob:5449a26982428bbd092868c89ce621fb4babd666
--- arch/x86/kernel/setup.c
+++ arch/x86/kernel/setup.c
@@ -110,6 +110,7 @@
#include <asm/numa_64.h>
#endif
#include <asm/mce.h>
+#include <asm/trampoline.h>
/*
* end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries.
@@ -998,6 +999,8 @@ void __init setup_arch(char **cmdline_p)
paging_init();
x86_init.paging.pagetable_setup_done(swapper_pg_dir);
+ setup_trampoline_page_table();
+
tboot_probe();
#ifdef CONFIG_X86_64