Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757689Ab3ETSm3 (ORCPT ); Mon, 20 May 2013 14:42:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:58984 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754412Ab3ETSm1 (ORCPT ); Mon, 20 May 2013 14:42:27 -0400 Date: Mon, 20 May 2013 11:42:05 -0700 From: "tip-bot for H. Peter Anvin" Message-ID: 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 Reply-To: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, tglx@linutronix.de, hpa@linux.intel.com, mhocko@suse.cz In-Reply-To: <20130520182306.GA5348@dhcp22.suse.cz> References: <20130520182306.GA5348@dhcp22.suse.cz> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86-64: Make early_pmd_flags __cpuinitdata Git-Commit-ID: 03762e92774e216bfad2e0c0e2f1cb581cfab632 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1739 Lines: 40 Commit-ID: 03762e92774e216bfad2e0c0e2f1cb581cfab632 Gitweb: http://git.kernel.org/tip/03762e92774e216bfad2e0c0e2f1cb581cfab632 Author: H. Peter Anvin AuthorDate: Mon, 20 May 2013 11:30:16 -0700 Committer: H. Peter Anvin 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 Debugged-by: Linus Torvalds Link: http://lkml.kernel.org/r/20130520182306.GA5348@dhcp22.suse.cz Cc: 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) -- 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/