---

yaml --- r: 99859 b: refs/heads/master c: 1ea598c h: refs/heads/master i: 99857: 01716cc 99855: b97351e v: v3
git-mirror · Jul 8, 2008 · fbe7239 · fbe7239
1 parent a725738
commit fbe7239
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f6cbc905ee22c457e0dcd0bba9d4affbc290a6f
+refs/heads/master: 1ea598c29748a559a0086a84a016886d786e6272
diff --git a/trunk/arch/x86/kernel/acpi/sleep.c b/trunk/arch/x86/kernel/acpi/sleep.c
@@ -86,7 +86,9 @@ int acpi_save_state_mem(void)
 	saved_magic = 0x12345678;
 #else /* CONFIG_64BIT */
 	header->trampoline_segment = setup_trampoline() >> 4;
+#ifdef CONFIG_SMP
 	stack_start.sp = temp_stack + 4096;
+#endif
 	initial_code = (unsigned long)wakeup_long64;
 	saved_magic = 0x123456789abcdef0;
 #endif /* CONFIG_64BIT */