Commit-ID: 62a3207b8cf3de35368cdc3822b30b82d59eea95 Gitweb: http://git.kernel.org/tip/62a3207b8cf3de35368cdc3822b30b82d59eea95 Author: H. Peter Anvin <hpa@xxxxxxxxx> AuthorDate: Mon, 17 Aug 2009 11:16:16 -0700 Committer: H. Peter Anvin <hpa@xxxxxxxxx> CommitDate: Mon, 17 Aug 2009 11:16:16 -0700 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@xxxxxxxxx> Cc: Shane Wang <shane.wang@xxxxxxxxx> Cc: Joseph Cihula <joseph.cihula@xxxxxxxxx> --- arch/x86/kernel/tboot.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c index a183bef..c2e760c 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); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|