]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
x86: Fix Suspend to RAM freeze on Acer Aspire 1511Lmi laptop
authorJan Beulich <JBeulich@novell.com>
Tue, 6 Oct 2009 15:32:43 +0000 (16:32 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 12 Oct 2009 16:06:48 +0000 (18:06 +0200)
Move the trampoline and accessors back out of .cpuinit.* for the
case of 64-bits+ACPI_SLEEP.

This solves s2ram hangs reported in:


Reported-and-bisected-by: Christian Casteyde <casteyde.christian@free.fr>
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: <bugzilla-daemon@bugzilla.kernel.org>
Cc: "Andrew Morton" <akpm@linux-foundation.org>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

index 699f7eeb896a15481e08130355c988c6e365190f..cd022121cab611629ec9b04de51677e44bef3567 100644 (file)
@@ -3,8 +3,16 @@
 #include <asm/trampoline.h>
 #include <asm/e820.h>
+#if defined(CONFIG_X86_64) && defined(CONFIG_ACPI_SLEEP)
+#define __trampinit
+#define __trampinitdata
+#define __trampinit __cpuinit
+#define __trampinitdata __cpuinitdata
 /* ready for x86_64 and x86 */
-unsigned char *__cpuinitdata trampoline_base = __va(TRAMPOLINE_BASE);
+unsigned char *__trampinitdata trampoline_base = __va(TRAMPOLINE_BASE);
 void __init reserve_trampoline_memory(void)
@@ -26,7 +34,7 @@ void __init reserve_trampoline_memory(void)
  * bootstrap into the page concerned. The caller
  * has made sure it's suitably aligned.
-unsigned long __cpuinit setup_trampoline(void)
+unsigned long __trampinit setup_trampoline(void)
        memcpy(trampoline_base, trampoline_data, TRAMPOLINE_SIZE);
        return virt_to_phys(trampoline_base);
index 596d54c660a5e63f819b46a06561b2b0ce3fcd90..3af2dff58b213262d403a8f9c1c55f84920b1d8d 100644 (file)
 #include <asm/segment.h>
 #include <asm/processor-flags.h>
+.section .rodata, "a", @progbits
 /* We can free up the trampoline after bootup if cpu hotplug is not supported. */