Messages in this thread Patch in this message | | | Date | Mon, 20 May 2013 11:42:05 -0700 | From | "tip-bot for H. Peter Anvin" <> | Subject | [tip:x86/urgent] x86-64: Make early_pmd_flags __cpuinitdata |
| |
Commit-ID: 03762e92774e216bfad2e0c0e2f1cb581cfab632 Gitweb: http://git.kernel.org/tip/03762e92774e216bfad2e0c0e2f1cb581cfab632 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:36:46 -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.
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)
| |