summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-08-17 11:16:16 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-08-17 11:16:16 -0700
commit62a3207b8cf3de35368cdc3822b30b82d59eea95 (patch)
treea033c86fed4aef491c32d8d979b6e5e17d559a09
parent3c556e4198926b284ff5ff6756111a64e1e98cb0 (diff)
x86, intel_txt: Handle ACPI_SLEEP without X86_TRAMPOLINE
On 32 bits, we can have CONFIG_ACPI_SLEEP set without implying CONFIG_X86_TRAMPOLINE. In that case, we simply do not need to mark the trampoline as a MAC region. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Shane Wang <shane.wang@intel.com> Cc: Joseph Cihula <joseph.cihula@intel.com>
-rw-r--r--arch/x86/kernel/tboot.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index a183beffe39e..c2e760ca7b01 100644
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -189,8 +189,12 @@ static int tboot_setup_sleep(void)
/* S3 resume code */
add_mac_region(acpi_wakeup_address, WAKEUP_SIZE);
+
+#ifdef CONFIG_X86_TRAMPOLINE
/* AP trampoline code */
add_mac_region(virt_to_phys(trampoline_base), TRAMPOLINE_SIZE);
+#endif
+
/* kernel code + data + bss */
add_mac_region(virt_to_phys(_text), _end - _text);