diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 07:45:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 07:45:59 -0400 |
| commit | 91d0322bef047e2916b3e52741411bffc63929cb (patch) | |
| tree | 44c4fd13cc17755a6db8a3d70cffb86e57a838dc /arch/x86/kernel/acpi/sleep.c | |
| parent | 065cb3dfe24978651caedfa54da585388ad15dde (diff) | |
| parent | 50515af207d410c9f228380e529c56f43c3de0bd (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'arch/x86/kernel/acpi/sleep.c')
| -rw-r--r-- | arch/x86/kernel/acpi/sleep.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index 41bb130c31db..793ad2045f58 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c | |||
| @@ -104,7 +104,9 @@ int acpi_save_state_mem(void) | |||
| 104 | saved_magic = 0x12345678; | 104 | saved_magic = 0x12345678; |
| 105 | #else /* CONFIG_64BIT */ | 105 | #else /* CONFIG_64BIT */ |
| 106 | header->trampoline_segment = setup_trampoline() >> 4; | 106 | header->trampoline_segment = setup_trampoline() >> 4; |
| 107 | init_rsp = (unsigned long)temp_stack + 4096; | 107 | #ifdef CONFIG_SMP |
| 108 | stack_start.sp = temp_stack + 4096; | ||
| 109 | #endif | ||
| 108 | initial_code = (unsigned long)wakeup_long64; | 110 | initial_code = (unsigned long)wakeup_long64; |
| 109 | saved_magic = 0x123456789abcdef0; | 111 | saved_magic = 0x123456789abcdef0; |
| 110 | #endif /* CONFIG_64BIT */ | 112 | #endif /* CONFIG_64BIT */ |