aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup.c
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2009-09-01 21:25:07 -0400
committerH. Peter Anvin <hpa@zytor.com>2009-09-01 21:25:07 -0400
commit69575d388603365f2afbf4166df93152df59b165 (patch)
treeca3d66668c8ec47befc0adbfa62cf135229bda59 /arch/x86/kernel/setup.c
parent62a3207b8cf3de35368cdc3822b30b82d59eea95 (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/setup.c')
-rw-r--r--arch/x86/kernel/setup.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 80d6e9e32483..6ce0d6f38f7f 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -66,6 +66,7 @@
66 66
67#include <linux/percpu.h> 67#include <linux/percpu.h>
68#include <linux/crash_dump.h> 68#include <linux/crash_dump.h>
69#include <linux/tboot.h>
69 70
70#include <video/edid.h> 71#include <video/edid.h>
71 72
@@ -145,8 +146,6 @@ struct boot_params __initdata boot_params;
145struct boot_params boot_params; 146struct boot_params boot_params;
146#endif 147#endif
147 148
148#include <asm/tboot.h>
149
150/* 149/*
151 * Machine setup.. 150 * Machine setup..
152 */ 151 */