summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorShane Wang2009-09-02 03:25:07 +0200
committerH. Peter Anvin2009-09-02 03:25:07 +0200
commit69575d388603365f2afbf4166df93152df59b165 (patch)
treeca3d66668c8ec47befc0adbfa62cf135229bda59 /arch/x86/Kconfig
parentx86, intel_txt: Handle ACPI_SLEEP without X86_TRAMPOLINE (diff)
downloadkernel-qcow2-linux-69575d388603365f2afbf4166df93152df59b165.tar.gz
kernel-qcow2-linux-69575d388603365f2afbf4166df93152df59b165.tar.xz
kernel-qcow2-linux-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 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 738bdc6b0f8b..b66f2102c35d 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -178,6 +178,10 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING
config ARCH_SUPPORTS_DEBUG_PAGEALLOC
def_bool y
+config HAVE_INTEL_TXT
+ def_bool y
+ depends on EXPERIMENTAL && DMAR && ACPI
+
# Use the generic interrupt handling code in kernel/irq/:
config GENERIC_HARDIRQS
bool