aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Wang2009-09-01 20:25:07 -0500
committerH. Peter Anvin2009-09-01 20:25:07 -0500
commit69575d388603365f2afbf4166df93152df59b165 (patch)
treeca3d66668c8ec47befc0adbfa62cf135229bda59 /security/Kconfig
parent62a3207b8cf3de35368cdc3822b30b82d59eea95 (diff)
downloadam43-linux-kernel-69575d388603365f2afbf4166df93152df59b165.tar.gz
am43-linux-kernel-69575d388603365f2afbf4166df93152df59b165.tar.xz
am43-linux-kernel-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 'security/Kconfig')
-rw-r--r--security/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/Kconfig b/security/Kconfig
index 6631774672c..5721847a7a6 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -115,7 +115,7 @@ config SECURITY_ROOTPLUG
115 115
116config INTEL_TXT 116config INTEL_TXT
117 bool "Enable Intel(R) Trusted Execution Technology (Intel(R) TXT)" 117 bool "Enable Intel(R) Trusted Execution Technology (Intel(R) TXT)"
118 depends on EXPERIMENTAL && X86 && DMAR && ACPI 118 depends on HAVE_INTEL_TXT
119 help 119 help
120 This option enables support for booting the kernel with the 120 This option enables support for booting the kernel with the
121 Trusted Boot (tboot) module. This will utilize 121 Trusted Boot (tboot) module. This will utilize