summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-01 10:11:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-01 10:11:21 -0700
commitb9b16a792241e304834f43e2a5f02e6e43576f09 (patch)
treef90a0e2266b73a2197a31d4b129a08f3f55e7b06 /drivers
parent4b2ce8f15f8fdcd8a73dd31664b252e2b4ed174a (diff)
parentda4aaa7d860c63a1bfd3c73cf8309afe2840c5b9 (diff)
downloadlinux-b9b16a792241e304834f43e2a5f02e6e43576f09.tar.bz2
Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cpufeature update from Ingo Molnar: "Two refinements to clflushopt support" * 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, cpufeature: If we disable CLFLUSH, we should disable CLFLUSHOPT x86, cpufeature: Rename X86_FEATURE_CLFLSH to X86_FEATURE_CLFLUSH
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/gma500/mmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/gma500/mmu.c b/drivers/gpu/drm/gma500/mmu.c
index 49bac41beefb..c3e67ba94446 100644
--- a/drivers/gpu/drm/gma500/mmu.c
+++ b/drivers/gpu/drm/gma500/mmu.c
@@ -520,7 +520,7 @@ struct psb_mmu_driver *psb_mmu_driver_init(uint8_t __iomem * registers,
driver->has_clflush = 0;
- if (boot_cpu_has(X86_FEATURE_CLFLSH)) {
+ if (boot_cpu_has(X86_FEATURE_CLFLUSH)) {
uint32_t tfms, misc, cap0, cap4, clflush_size;
/*