From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756100AbYGDWEA (ORCPT ); Fri, 4 Jul 2008 18:04:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752775AbYGDWDv (ORCPT ); Fri, 4 Jul 2008 18:03:51 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:49451 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752774AbYGDWDu (ORCPT ); Fri, 4 Jul 2008 18:03:50 -0400 From: "Rafael J. Wysocki" To: Ingo Molnar Subject: [PATCH] x86 ACPI: Fix resume from suspend to RAM on uniprocessor x86-64 Date: Sat, 5 Jul 2008 00:05:30 +0200 User-Agent: KMail/1.9.6 (enterprise 20070904.708012) Cc: ACPI Devel Maling List , Andi Kleen , Andrew Morton , LKML , pm list MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200807050005.31272.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Ingo, This is a regression fix, please push to Linus ASAP. Thanks, Rafael --- From: Rafael J. Wysocki 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 --- 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