---

yaml --- r: 161386 b: refs/heads/master c: 62a3207 h: refs/heads/master v: v3
git-mirror · Aug 17, 2009 · bf5500c · bf5500c
1 parent 2b73029
commit bf5500c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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);