Skip to content

Commit

Permalink
x86, intel_txt: Handle ACPI_SLEEP without X86_TRAMPOLINE
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H. Peter Anvin committed Aug 17, 2009
1 parent 3c556e4 commit 62a3207
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions arch/x86/kernel/tboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 62a3207

Please sign in to comment.