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 /security/Kconfig | |
| 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 'security/Kconfig')
| -rw-r--r-- | security/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/Kconfig b/security/Kconfig index 6631774672c1..5721847a7a62 100644 --- a/security/Kconfig +++ b/security/Kconfig | |||
| @@ -115,7 +115,7 @@ config SECURITY_ROOTPLUG | |||
| 115 | 115 | ||
| 116 | config INTEL_TXT | 116 | config 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 |