diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 13:27:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 13:27:05 -0700 |
| commit | b9d7ccf56be1ac77b71a284a1c0e6337f9a7aff0 (patch) | |
| tree | 6440e1c679e097d0ea23bf879cd30983c5838419 /arch | |
| parent | 9301975ec251bab1ad7cfcb84a688b26187e4e4a (diff) | |
| parent | 3038edabf48f01421c621cb77a712b446d3a5d67 (diff) | |
| download | linux-b9d7ccf56be1ac77b71a284a1c0e6337f9a7aff0.tar.gz linux-b9d7ccf56be1ac77b71a284a1c0e6337f9a7aff0.tar.bz2 linux-b9d7ccf56be1ac77b71a284a1c0e6337f9a7aff0.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86 ACPI: fix breakage of resume on 64-bit UP systems with SMP kernel
Introduce is_vmalloc_or_module_addr() and use with DEBUG_VIRTUAL
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/acpi/sleep.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index 426e5d91b63a..c44cd6dbfa14 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -10,6 +10,7 @@ #include <linux/dmi.h> #include <linux/cpumask.h> #include <asm/segment.h> +#include <asm/desc.h> #include "realmode/wakeup.h" #include "sleep.h" @@ -98,6 +99,8 @@ int acpi_save_state_mem(void) header->trampoline_segment = setup_trampoline() >> 4; #ifdef CONFIG_SMP stack_start.sp = temp_stack + 4096; + early_gdt_descr.address = + (unsigned long)get_cpu_gdt_table(smp_processor_id()); #endif initial_code = (unsigned long)wakeup_long64; saved_magic = 0x123456789abcdef0; |