--- arch/x86/kernel/setup.c

+++ arch/x86/kernel/setup.c

@@ -110,7 +110,6 @@

#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.

@@ -999,8 +998,6 @@ 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