x86 ACPI: fix resume from suspend to RAM on uniprocessor x86-64
authorRafael J. Wysocki <rjw@sisk.pl>
Fri, 4 Jul 2008 22:05:30 +0000 (00:05 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 5 Jul 2008 06:42:28 +0000 (08:42 +0200)
Since the trampoline code is now used for ACPI resume from suspend to RAM,
the trampoline page tables have to be fixed up during boot not only on SMP
systems, but also on UP systems that use the trampoline.

Reference: http://bugzilla.kernel.org/show_bug.cgi?id=10923

Reported-by: Dionisus Torimens <djtm@gmx.net>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: pm list <linux-pm@lists.linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/head_64.S

index 10a1955bb1d17df7f90bff735ae733b648f58c15..b817974ef9420bba5702327a1089156dcb5d72c3 100644 (file)
@@ -128,7 +128,7 @@ ident_complete:
        /* Fixup phys_base */
        addq    %rbp, phys_base(%rip)
 
-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_TRAMPOLINE
        addq    %rbp, trampoline_level4_pgt + 0(%rip)
        addq    %rbp, trampoline_level4_pgt + (511*8)(%rip)
 #endif