summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/intel.c
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-03-29 17:41:59 +0200
committerIngo Molnar <mingo@kernel.org>2016-03-31 13:35:09 +0200
commit906bf7fda2c9cf5c1762ec607943ed54b6c5b203 (patch)
tree010f7332a1cca5f71b299adb36179ad86af07cb2 /arch/x86/kernel/cpu/intel.c
parentb8291adc191abec2095f03a130ac91506d345cae (diff)
downloadop-kernel-dev-906bf7fda2c9cf5c1762ec607943ed54b6c5b203.zip
op-kernel-dev-906bf7fda2c9cf5c1762ec607943ed54b6c5b203.tar.gz
x86/cpufeature: Remove cpu_has_clflush
Use the fast variant in the DRM code. Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org Link: http://lkml.kernel.org/r/1459266123-21878-7-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/intel.c')
-rw-r--r--arch/x86/kernel/cpu/intel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 1f7fdb9..628a9f8 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -468,7 +468,7 @@ static void init_intel(struct cpuinfo_x86 *c)
set_cpu_cap(c, X86_FEATURE_PEBS);
}
- if (c->x86 == 6 && cpu_has_clflush &&
+ if (c->x86 == 6 && boot_cpu_has(X86_FEATURE_CLFLUSH) &&
(c->x86_model == 29 || c->x86_model == 46 || c->x86_model == 47))
set_cpu_bug(c, X86_BUG_CLFLUSH_MONITOR);
OpenPOWER on IntegriCloud