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

arch/x86/kernel/cpu/centaur.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);