From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753808AbbBSBVz (ORCPT ); Wed, 18 Feb 2015 20:21:55 -0500 Received: from terminus.zytor.com ([198.137.202.10]:48228 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751728AbbBSBVy (ORCPT ); Wed, 18 Feb 2015 20:21:54 -0500 Date: Wed, 18 Feb 2015 17:21:30 -0800 From: tip-bot for Jan Beulich Message-ID: Cc: linux-kernel@vger.kernel.org, jbeulich@suse.com, torvalds@linux-foundation.org, tglx@linutronix.de, mingo@kernel.org, JBeulich@suse.com, hpa@zytor.com, luto@amacapital.net Reply-To: linux-kernel@vger.kernel.org, jbeulich@suse.com, torvalds@linux-foundation.org, tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, luto@amacapital.net, JBeulich@suse.com In-Reply-To: <54C215D10200007800058912@mail.emea.novell.com> References: <54C215D10200007800058912@mail.emea.novell.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86-64: Also clear _PAGE_GLOBAL from __supported_pte_mask if !cpu_has_pge Git-Commit-ID: 0cdb81bef20b1d9e12111fa6cd81f748ebd87778 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 Commit-ID: 0cdb81bef20b1d9e12111fa6cd81f748ebd87778 Gitweb: http://git.kernel.org/tip/0cdb81bef20b1d9e12111fa6cd81f748ebd87778 Author: Jan Beulich AuthorDate: Fri, 23 Jan 2015 08:35:13 +0000 Committer: Ingo Molnar CommitDate: Thu, 19 Feb 2015 02:18:26 +0100 x86-64: Also clear _PAGE_GLOBAL from __supported_pte_mask if !cpu_has_pge Not just setting it when the feature is available is for consistency, and may allow Xen to drop its custom clearing of the flag (unless it needs it cleared earlier than this code executes). Note that the change is benign to ix86, as the flag starts out clear there. Signed-off-by: Jan Beulich Cc: Andy Lutomirski Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/54C215D10200007800058912@mail.emea.novell.com Signed-off-by: Ingo Molnar --- arch/x86/mm/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 079c3b6..090499a 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -179,7 +179,8 @@ static void __init probe_page_size_mask(void) if (cpu_has_pge) { set_in_cr4(X86_CR4_PGE); __supported_pte_mask |= _PAGE_GLOBAL; - } + } else + __supported_pte_mask &= ~_PAGE_GLOBAL; } #ifdef CONFIG_X86_32