Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756883AbcC2KkY (ORCPT ); Tue, 29 Mar 2016 06:40:24 -0400 Received: from terminus.zytor.com ([198.137.202.10]:47252 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753911AbcC2KkV (ORCPT ); Tue, 29 Mar 2016 06:40:21 -0400 Date: Tue, 29 Mar 2016 03:38:47 -0700 From: tip-bot for Toshi Kani Message-ID: Cc: tglx@linutronix.de, bp@suse.de, toshi.kani@hp.com, jgross@suse.com, mingo@kernel.org, bp@alien8.de, akpm@linux-foundation.org, peterz@infradead.org, mcgrof@suse.com, linux-kernel@vger.kernel.org, brgerst@gmail.com, toshi.kani@hpe.com, dvlasenk@redhat.com, luto@amacapital.net, elliott@hpe.com, torvalds@linux-foundation.org, hpa@zytor.com Reply-To: luto@amacapital.net, torvalds@linux-foundation.org, elliott@hpe.com, hpa@zytor.com, dvlasenk@redhat.com, toshi.kani@hpe.com, brgerst@gmail.com, bp@alien8.de, akpm@linux-foundation.org, mcgrof@suse.com, peterz@infradead.org, linux-kernel@vger.kernel.org, bp@suse.de, toshi.kani@hp.com, tglx@linutronix.de, mingo@kernel.org, jgross@suse.com In-Reply-To: <1458769323-24491-4-git-send-email-toshi.kani@hpe.com> References: <1458769323-24491-4-git-send-email-toshi.kani@hpe.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm/pat: Replace cpu_has_pat with boot_cpu_has() Git-Commit-ID: d63dcf49cf5ae5605f4d14229e3888e104f294b1 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: 2139 Lines: 63 Commit-ID: d63dcf49cf5ae5605f4d14229e3888e104f294b1 Gitweb: http://git.kernel.org/tip/d63dcf49cf5ae5605f4d14229e3888e104f294b1 Author: Toshi Kani AuthorDate: Wed, 23 Mar 2016 15:41:59 -0600 Committer: Ingo Molnar CommitDate: Tue, 29 Mar 2016 12:23:26 +0200 x86/mm/pat: Replace cpu_has_pat with boot_cpu_has() Borislav Petkov suggested: > Please use on init paths boot_cpu_has(X86_FEATURE_PAT) and on fast > paths static_cpu_has(X86_FEATURE_PAT). No more of that cpu_has_XXX > ugliness. Replace the use of cpu_has_pat on init paths with boot_cpu_has(). Suggested-by: Borislav Petkov Signed-off-by: Toshi Kani Reviewed-by: Thomas Gleixner Cc: Andrew Morton Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Juergen Gross Cc: Linus Torvalds Cc: Luis R. Rodriguez Cc: Peter Zijlstra Cc: Robert Elliott Cc: Toshi Kani Cc: konrad.wilk@oracle.com Cc: paul.gortmaker@windriver.com Cc: xen-devel@lists.xenproject.org Link: http://lkml.kernel.org/r/1458769323-24491-4-git-send-email-toshi.kani@hpe.com Signed-off-by: Ingo Molnar --- arch/x86/mm/pat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index 1cc1d37..59ec038 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c @@ -213,7 +213,7 @@ static void pat_bsp_init(u64 pat) { u64 tmp_pat; - if (!cpu_has_pat) { + if (!boot_cpu_has(X86_FEATURE_PAT)) { pat_disable("PAT not supported by CPU."); return; } @@ -231,7 +231,7 @@ static void pat_bsp_init(u64 pat) static void pat_ap_init(u64 pat) { - if (!cpu_has_pat) { + if (!boot_cpu_has(X86_FEATURE_PAT)) { /* * If this happens we are on a secondary CPU, but switched to * PAT on the boot CPU. We have no way to undo PAT.