openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
H. Peter Anvin 2009-08-17 11:16:16 -07:00
parent 3c556e4198
commit 62a3207b8c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/tboot.c
View File

@ -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);