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 <rjw@xxxxxxx> > > 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 <rjw@xxxxxxx> I should have added: Reported-by: Dionisus Torimens <djtm@xxxxxxx> > --- > 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 majordomo@xxxxxxxxxxxxxxx > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
