Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758037Ab1CaOsX (ORCPT ); Thu, 31 Mar 2011 10:48:23 -0400 Received: from smtp.eu.citrix.com ([62.200.22.115]:53727 "EHLO SMTP.EU.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758022Ab1CaOsV (ORCPT ); Thu, 31 Mar 2011 10:48:21 -0400 X-IronPort-AV: E=Sophos;i="4.63,275,1299456000"; d="scan'208";a="5078815" Date: Thu, 31 Mar 2011 15:48:44 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball-desktop To: Michael Leun CC: Yinghai Lu , "linux-kernel@vger.kernel.org" , Greg Kroah-Hartman , Mike Pagano Subject: Re: 2.6.38.2 breaks suspend to disk In-Reply-To: <20110331090524.07ad0069@xenia.leun.net> Message-ID: References: <20110330203215.0a1a41a7@xenia.leun.net> <4D940DD0.7000704@kernel.org> <20110331090524.07ad0069@xenia.leun.net> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1117 Lines: 37 On Thu, 31 Mar 2011, Michael Leun wrote: > Nope, unfortunately this does not change anything (neither when > applying ontop of the tree resulting from bisecting, nor ontop > 2.6.38.2). > > Just to make shure there was no mistake when bisecting I did > > patch -R -p1 <~/linux-2.6.38.y.git-ff518ea26654e05d325d996f6e3a7f5f569cc2d5.txt > > and then indeed it worked again. This patch fixes it for me. --- save cr4 to mmu_cr4_features at boot time Signed-off-by: Stefano Stabellini diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 5a0484a..0943eb2 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -891,6 +891,7 @@ void __init setup_arch(char **cmdline_p) max_low_pfn = max_pfn; high_memory = (void *)__va(max_pfn * PAGE_SIZE - 1) + 1; + mmu_cr4_features = read_cr4(); #endif /* -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/