summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-06 14:00:44 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-06 14:00:44 -0800
commit2c364faabb8ef400e4632bb989287bcd7c0a9148 (patch)
tree4db7a369a6336800014904f4dd05f8eda36a0f6f
parentcf3f33551b6d0acf8d21a53c9aa9cf8a0d73afa3 (diff)
parentcb3f718de8301a969f8169d7d4160e73baff0b86 (diff)
downloadlinux-3.10-2c364faabb8ef400e4632bb989287bcd7c0a9148.tar.gz
linux-3.10-2c364faabb8ef400e4632bb989287bcd7c0a9148.tar.bz2
linux-3.10-2c364faabb8ef400e4632bb989287bcd7c0a9148.zip
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, centaur: Enable cx8 for VIA Eden too
-rw-r--r--arch/x86/kernel/cpu/centaur.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c
index e58d978e075..159103c0b1f 100644
--- a/arch/x86/kernel/cpu/centaur.c
+++ b/arch/x86/kernel/cpu/centaur.c
@@ -278,7 +278,7 @@ static void __cpuinit init_c3(struct cpuinfo_x86 *c)
}
#ifdef CONFIG_X86_32
/* Cyrix III family needs CX8 & PGE explicitly enabled. */
- if (c->x86_model >= 6 && c->x86_model <= 9) {
+ if (c->x86_model >= 6 && c->x86_model <= 13) {
rdmsr(MSR_VIA_FCR, lo, hi);
lo |= (1<<1 | 1<<7);
wrmsr(MSR_VIA_FCR, lo, hi);