Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756607AbcCaNBo (ORCPT ); Thu, 31 Mar 2016 09:01:44 -0400 Received: from terminus.zytor.com ([198.137.202.10]:42602 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750762AbcCaNBm (ORCPT ); Thu, 31 Mar 2016 09:01:42 -0400 Date: Thu, 31 Mar 2016 06:00:48 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: tglx@linutronix.de, torvalds@linux-foundation.org, bp@suse.de, hpa@zytor.com, mingo@kernel.org, daniel.vetter@ffwll.ch, peterz@infradead.org, linux-kernel@vger.kernel.org Reply-To: torvalds@linux-foundation.org, tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, bp@suse.de, peterz@infradead.org, daniel.vetter@ffwll.ch, linux-kernel@vger.kernel.org In-Reply-To: <1459266123-21878-9-git-send-email-bp@alien8.de> References: <1459266123-21878-9-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm/pat, x86/cpufeature: Remove cpu_has_pat Git-Commit-ID: 568a58e5dfbcb88011cad7f87ed046aa00f19d1a 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: 2073 Lines: 47 Commit-ID: 568a58e5dfbcb88011cad7f87ed046aa00f19d1a Gitweb: http://git.kernel.org/tip/568a58e5dfbcb88011cad7f87ed046aa00f19d1a Author: Borislav Petkov AuthorDate: Tue, 29 Mar 2016 17:42:01 +0200 Committer: Ingo Molnar CommitDate: Thu, 31 Mar 2016 13:32:43 +0200 x86/mm/pat, x86/cpufeature: Remove cpu_has_pat Signed-off-by: Borislav Petkov Acked-by: Daniel Vetter Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: intel-gfx@lists.freedesktop.org Link: http://lkml.kernel.org/r/1459266123-21878-9-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/include/asm/cpufeature.h | 1 - drivers/gpu/drm/i915/i915_gem.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 3636ec0..7a3fa7d 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -132,7 +132,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; #define cpu_has_clflush boot_cpu_has(X86_FEATURE_CLFLUSH) #define cpu_has_gbpages boot_cpu_has(X86_FEATURE_GBPAGES) #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) -#define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT) #define cpu_has_x2apic boot_cpu_has(X86_FEATURE_X2APIC) #define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE) #define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 3d31d3a..aaec8ae 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1732,7 +1732,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, if (args->flags & ~(I915_MMAP_WC)) return -EINVAL; - if (args->flags & I915_MMAP_WC && !cpu_has_pat) + if (args->flags & I915_MMAP_WC && !boot_cpu_has(X86_FEATURE_PAT)) return -ENODEV; obj = drm_gem_object_lookup(dev, file, args->handle);