From bf5500c617fe058d6119a469af69c41df6c2d047 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Mon, 17 Aug 2009 11:16:16 -0700
Subject: [PATCH] --- yaml --- r: 161386 b: refs/heads/master c:
 62a3207b8cf3de35368cdc3822b30b82d59eea95 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/x86/kernel/tboot.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 70306c17160b..7dba4ddd9017 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c556e4198926b284ff5ff6756111a64e1e98cb0
+refs/heads/master: 62a3207b8cf3de35368cdc3822b30b82d59eea95
diff --git a/trunk/arch/x86/kernel/tboot.c b/trunk/arch/x86/kernel/tboot.c
index a183beffe39e..c2e760ca7b01 100644
--- a/trunk/arch/x86/kernel/tboot.c
+++ b/trunk/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);