[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.DEB.2.00.1103311715400.16492@kaball-desktop>
Date: Thu, 31 Mar 2011 17:38:31 +0100
From: Stefano Stabellini <stefano.stabellini@...citrix.com>
To: "H. Peter Anvin" <hpa@...or.com>
CC: <x86@...nel.org>, <yinghai@...nel.org>,
<linux-kernel@...r.kernel.org>,
Stefano Stabellini <Stefano.Stabellini@...citrix.com>,
Greg KH <gregkh@...e.de>, <lkml20101129@...ton.leun.net>
Subject: [PATCH urgent] x86: Save cr4 to mmu_cr4_features at boot time
Save cr4 to mmu_cr4_features at boot time
This patch fixes a freeze when resuming from hibernation, introduced by
"x86: Cleanup highmap after brk is concluded", commit id
e5f15b45ddf3afa2bbbb10c7ea34fb32b6de0a0e.
This patch should be backported to all the stable tree where the
offending commit is present.
Signed-off-by: Stefano Stabellini <stefano.stabellini@...citrix.com>
Tested-by: Michael Leun <lkml20101129@...ton.leun.net>
CC: Yinghai Lu <yinghai@...nel.org>
CC: stable <stable@...nel.org>
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@...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