[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <200807050008.30497.Rafal.Wysocki@fuw.edu.pl>
Date: Sat, 5 Jul 2008 00:08:29 +0200
From: "R. J. Wysocki" <Rafal.Wysocki@....edu.pl>
To: Ingo Molnar <mingo@...e.hu>
Cc: ACPI Devel Maling List <linux-acpi@...r.kernel.org>,
Andi Kleen <andi@...stfloor.org>,
Andrew Morton <akpm@...ux-foundation.org>,
LKML <linux-kernel@...r.kernel.org>,
pm list <linux-pm@...ts.linux-foundation.org>,
Dionisus Torimens <djtm@....net>
Subject: Re: [PATCH] x86 ACPI: Fix resume from suspend to RAM on uniprocessor x86-64
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@...k.pl>
>
> 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@...k.pl>
I should have added:
Reported-by: Dionisus Torimens <djtm@....net>
> ---
> 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@...r.kernel.org
> 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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists