From: "tip-bot for H. Peter Anvin" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
torvalds@linux-foundation.org, tglx@linutronix.de,
mhocko@suse.cz, hpa@linux.intel.com
Subject: [tip:x86/urgent] x86-64: Make early_pmd_flags __cpuinitdata
Date: Mon, 20 May 2013 11:50:12 -0700 [thread overview]
Message-ID: <tip-3a6a27dbe46298ee78a4135fa43c11f6bb3f8a6c@git.kernel.org> (raw)
In-Reply-To: <20130520182306.GA5348@dhcp22.suse.cz>
Commit-ID: 3a6a27dbe46298ee78a4135fa43c11f6bb3f8a6c
Gitweb: http://git.kernel.org/tip/3a6a27dbe46298ee78a4135fa43c11f6bb3f8a6c
Author: H. Peter Anvin <hpa@linux.intel.com>
AuthorDate: Mon, 20 May 2013 11:30:16 -0700
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Mon, 20 May 2013 11:44:52 -0700
x86-64: Make early_pmd_flags __cpuinitdata
Although early_pmd_flags is not actually *used* except at init time, it
is *set* in secondary_startup_64, which is executed on any CPU
startup, including hotplug and S3 resume.
Originally-by: Michal Hocko <mhocko@suse.cz>
Reported-and-tested-by: Michal Hocko <mhocko@suse.cz>
Debugged-by: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/20130520182306.GA5348@dhcp22.suse.cz
Cc: <stable@vger.kernel.org> v3.9
---
arch/x86/kernel/head64.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index dab95a8..aa67bdd 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -34,7 +34,8 @@
extern pgd_t early_level4_pgt[PTRS_PER_PGD];
extern pmd_t early_dynamic_pgts[EARLY_DYNAMIC_PAGE_TABLES][PTRS_PER_PMD];
static unsigned int __initdata next_early_pgt = 2;
-pmdval_t __initdata early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL | _PAGE_NX);
+pmdval_t __cpuinitdata early_pmd_flags =
+ __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL | _PAGE_NX);
/* Wipe all early page tables except for the kernel symbol map */
static void __init reset_early_page_tables(void)
prev parent reply other threads:[~2013-05-20 18:50 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-14 16:01 3.10-rc1 system starts regular boot when waking from s2ram Michal Hocko
2013-05-14 20:09 ` Rafael J. Wysocki
2013-05-15 8:01 ` Michal Hocko
2013-05-15 8:29 ` Pavel Machek
2013-05-15 9:05 ` Pavel Machek
2013-05-15 9:56 ` Michal Hocko
2013-05-17 7:54 ` Michal Hocko
2013-05-17 12:11 ` Rafael J. Wysocki
2013-05-17 12:09 ` Michal Hocko
2013-05-17 12:23 ` Rafael J. Wysocki
2013-05-17 12:30 ` Michal Hocko
2013-05-15 13:17 ` CONFIG_HYPERVISOR_GUEST=y {-- replace -- CONFIG_PARAVIRT_GUEST=y {= { # CONFIG_HYPERVISOR_GUEST is not set } Re: 3.10-rc1 system starts regular boot when waking from s2ram Fw: [PATCH 2/2] x86: Make Linux guest support optional Victor Miasnikov
2013-05-15 13:34 ` Michal Hocko
2013-05-15 13:44 ` Victor Miasnikov
2013-05-15 13:46 ` Michal Hocko
2013-05-15 14:05 ` CONFIG_HYPERVISOR_GUEST=y {-- replace -- CONFIG_PARAVIRT_GUEST=y {= { # CONFIG_HYPERVISOR_GUEST is not set } Re: 3.10-rc1 " Victor Miasnikov
2013-05-15 14:21 ` Borislav Petkov
2013-05-15 14:52 ` Victor Miasnikov
2013-05-15 17:34 ` Luck, Tony
2013-05-20 15:03 ` [PATCH] Revert "x86-64, init: Do not set NX bits on non-NX capable hardware" Michal Hocko
2013-05-20 15:58 ` H. Peter Anvin
2013-05-20 16:43 ` Michal Hocko
2013-05-20 17:21 ` Linus Torvalds
2013-05-20 18:13 ` H. Peter Anvin
2013-05-20 18:18 ` Linus Torvalds
2013-05-20 18:19 ` H. Peter Anvin
2013-05-20 18:23 ` Michal Hocko
2013-05-20 18:30 ` H. Peter Anvin
2013-05-20 18:31 ` Michal Hocko
2013-05-20 18:31 ` Linus Torvalds
2013-05-20 18:36 ` H. Peter Anvin
2013-05-20 18:42 ` [tip:x86/urgent] x86-64: Make early_pmd_flags __cpuinitdata tip-bot for H. Peter Anvin
2013-05-20 18:50 ` tip-bot for H. Peter Anvin [this message]
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=tip-3a6a27dbe46298ee78a4135fa43c11f6bb3f8a6c@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mhocko@suse.cz \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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
Powered by JetHome