From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: <x86@kernel.org>, <yinghai@kernel.org>,
<linux-kernel@vger.kernel.org>,
Stefano Stabellini <Stefano.Stabellini@eu.citrix.com>,
Greg KH <gregkh@suse.de>, <lkml20101129@newton.leun.net>
Subject: [PATCH urgent] x86: Save cr4 to mmu_cr4_features at boot time
Date: Thu, 31 Mar 2011 17:38:31 +0100 [thread overview]
Message-ID: <alpine.DEB.2.00.1103311715400.16492@kaball-desktop> (raw)
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@eu.citrix.com>
Tested-by: Michael Leun <lkml20101129@newton.leun.net>
CC: Yinghai Lu <yinghai@kernel.org>
CC: stable <stable@kernel.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
/*
next reply other threads:[~2011-03-31 16:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-31 16:38 Stefano Stabellini [this message]
2011-04-01 6:23 ` Ingo Molnar
2011-04-01 11:30 ` Stefano Stabellini
2011-04-01 18:51 ` H. Peter Anvin
2011-04-01 19:08 ` Ingo Molnar
2011-04-01 20:59 ` [stable] " Greg KH
2011-04-01 22:57 ` Stefano Stabellini
2011-04-04 15:11 ` Ingo Molnar
2011-04-04 15:47 ` Stefano Stabellini
2011-04-04 16:25 ` Ingo Molnar
2011-04-05 6:29 ` Rafael J. Wysocki
2011-04-05 6:37 ` H. Peter Anvin
2011-04-05 6:43 ` Rafael J. Wysocki
2011-04-05 6:55 ` H. Peter Anvin
2011-04-05 23:47 ` H. Peter Anvin
2011-04-06 4:34 ` Rafael J. Wysocki
2011-04-06 4:45 ` H. Peter Anvin
2011-04-11 23:04 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.00.1103311715400.16492@kaball-desktop \
--to=stefano.stabellini@eu.citrix.com \
--cc=gregkh@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lkml20101129@newton.leun.net \
--cc=x86@kernel.org \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®