Hi Ingo,
This is a regression fix, please push to Linus ASAP.
Thanks,
Rafael
---
From: Rafael J. Wysocki <[email protected]>
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
Signed-off-by: Rafael J. Wysocki <[email protected]>
---
arch/x86/kernel/head_64.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6/arch/x86/kernel/head_64.S
===================================================================
--- linux-2.6.orig/arch/x86/kernel/head_64.S
+++ linux-2.6/arch/x86/kernel/head_64.S
@@ -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
On Saturday, 5 of July 2008, Rafael J. Wysocki wrote:
> Hi Ingo,
>
> This is a regression fix, please push to Linus ASAP.
>
> Thanks,
> Rafael
>
> ---
> From: Rafael J. Wysocki <[email protected]>
>
> 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
>
> Signed-off-by: Rafael J. Wysocki <[email protected]>
I should have added:
Reported-by: Dionisus Torimens <[email protected]>
> ---
> arch/x86/kernel/head_64.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-2.6/arch/x86/kernel/head_64.S
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/head_64.S
> +++ linux-2.6/arch/x86/kernel/head_64.S
> @@ -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
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
--
Rafael J. Wysocki, Ph.D.
Institute of Theoretical Physics
Faculty of Physics of Warsaw University
ul. Hoza 69, 00-681 Warsaw
[tel: +48 22 55 32 263]
[mob: +48 60 50 53 693]
----------------------------
One should not increase, beyond what is necessary,
the number of entities required to explain anything.
-- William of Ockham
* R. J. Wysocki <[email protected]> wrote:
> On Saturday, 5 of July 2008, Rafael J. Wysocki wrote:
> > Hi Ingo,
> >
> > This is a regression fix, please push to Linus ASAP.
> Reported-by: Dionisus Torimens <[email protected]>
applied to tip/x86/urgent - thanks Rafael. I also queued up Peter's "x86
ACPI: normalize segment descriptor register on resume" fix.
Ingo
On Sat 2008-07-05 08:44:04, Ingo Molnar wrote:
>
> * R. J. Wysocki <[email protected]> wrote:
>
> > On Saturday, 5 of July 2008, Rafael J. Wysocki wrote:
> > > Hi Ingo,
> > >
> > > This is a regression fix, please push to Linus ASAP.
>
> > Reported-by: Dionisus Torimens <[email protected]>
>
> applied to tip/x86/urgent - thanks Rafael. I also queued up Peter's "x86
> ACPI: normalize segment descriptor register on resume" fix.
You can add my acked-by... and sorry for the error.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html