diff options
author | Shane Wang <shane.wang@intel.com> | 2009-09-01 21:25:07 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-09-01 21:25:07 -0400 |
commit | 69575d388603365f2afbf4166df93152df59b165 (patch) | |
tree | ca3d66668c8ec47befc0adbfa62cf135229bda59 /arch/x86/kernel/smpboot.c | |
parent | 62a3207b8cf3de35368cdc3822b30b82d59eea95 (diff) |
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 'arch/x86/kernel/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 61cc40887c48..7d9d8eea20a0 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -47,6 +47,7 @@ | |||
47 | #include <linux/bootmem.h> | 47 | #include <linux/bootmem.h> |
48 | #include <linux/err.h> | 48 | #include <linux/err.h> |
49 | #include <linux/nmi.h> | 49 | #include <linux/nmi.h> |
50 | #include <linux/tboot.h> | ||
50 | 51 | ||
51 | #include <asm/acpi.h> | 52 | #include <asm/acpi.h> |
52 | #include <asm/desc.h> | 53 | #include <asm/desc.h> |
@@ -62,7 +63,6 @@ | |||
62 | #include <asm/vmi.h> | 63 | #include <asm/vmi.h> |
63 | #include <asm/apic.h> | 64 | #include <asm/apic.h> |
64 | #include <asm/setup.h> | 65 | #include <asm/setup.h> |
65 | #include <asm/tboot.h> | ||
66 | #include <asm/uv/uv.h> | 66 | #include <asm/uv/uv.h> |
67 | #include <linux/mc146818rtc.h> | 67 | #include <linux/mc146818rtc.h> |
68 | 68 | ||