]>
Commit | Line | Data |
---|---|---|
cc90b958 BS |
1 | From: Greg Kroah-Hartman <gregkh@suse.de> |
2 | Subject: Linux 2.6.27.4 | |
3 | ||
4 | Upstream 2.6.27.4 release from kernel.org | |
5 | ||
6 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
7 | ||
8 | Automatically created from "patches.kernel.org/patch-2.6.27.3-4" by xen-port-patches.py | |
9 | ||
10 | Index: head-2008-10-29/arch/x86/kernel/acpi/sleep-xen.c | |
11 | =================================================================== | |
12 | --- head-2008-10-29.orig/arch/x86/kernel/acpi/sleep-xen.c 2008-10-29 11:26:27.000000000 +0100 | |
13 | +++ head-2008-10-29/arch/x86/kernel/acpi/sleep-xen.c 2008-10-29 11:29:30.000000000 +0100 | |
14 | @@ -10,6 +10,7 @@ | |
15 | #include <linux/dmi.h> | |
16 | #include <linux/cpumask.h> | |
17 | #include <asm/segment.h> | |
18 | +#include <asm/desc.h> | |
19 | ||
20 | #include "realmode/wakeup.h" | |
21 | #include "sleep.h" | |
22 | @@ -101,6 +102,8 @@ int acpi_save_state_mem(void) | |
23 | header->trampoline_segment = setup_trampoline() >> 4; | |
24 | #ifdef CONFIG_SMP | |
25 | stack_start.sp = temp_stack + 4096; | |
26 | + early_gdt_descr.address = | |
27 | + (unsigned long)get_cpu_gdt_table(smp_processor_id()); | |
28 | #endif | |
29 | initial_code = (unsigned long)wakeup_long64; | |
30 | saved_magic = 0x123456789abcdef0; |