diff options
| author |   Shane Wang <shane.wang@intel.com> | 2009-09-01 18:25:07 -0700 |
|---|---|---|
| committer |   H. Peter Anvin <hpa@zytor.com> | 2009-09-01 18:25:07 -0700 |
| commit | 69575d388603365f2afbf4166df93152df59b165 (patch) | |
| tree | ca3d66668c8ec47befc0adbfa62cf135229bda59 /init/main.c | |
| parent | x86, intel_txt: Handle ACPI_SLEEP without X86_TRAMPOLINE (diff) | |
| download | linux-dev-69575d388603365f2afbf4166df93152df59b165.tar.xz linux-dev-69575d388603365f2afbf4166df93152df59b165.zip | |
x86, intel_txt: clean up the impact on generic code, unbreak non-x86
Move tboot.h from asm to linux to fix the build errors of intel_txt
patch on non-X86 platforms. Remove the tboot code from generic code
init/main.c and kernel/cpu.c.
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to '')
| -rw-r--r-- | init/main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c index 56ada27c4f47..2c5ade79eb81 100644 --- a/init/main.c +++ b/init/main.c @@ -73,7 +73,6 @@ #include <asm/io.h> #include <asm/bugs.h> #include <asm/setup.h> -#include <asm/tboot.h> #include <asm/sections.h> #include <asm/cacheflush.h> @@ -716,8 +715,6 @@ asmlinkage void __init start_kernel(void) ftrace_init(); - tboot_create_trampoline(); - /* Do the rest non-__init'ed, we're now alive */ rest_init(); } |