git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
cpu
/
centaur.c
diff --git
a/arch/i386/kernel/cpu/centaur.c
b/arch/i386/kernel/cpu/centaur.c
index
394814e
..
bd75629
100644
(file)
--- a/
arch/i386/kernel/cpu/centaur.c
+++ b/
arch/i386/kernel/cpu/centaur.c
@@
-4,6
+4,7
@@
#include <asm/processor.h>
#include <asm/msr.h>
#include <asm/e820.h>
#include <asm/processor.h>
#include <asm/msr.h>
#include <asm/e820.h>
+#include <asm/mtrr.h>
#include "cpu.h"
#ifdef CONFIG_X86_OOSTORE
#include "cpu.h"
#ifdef CONFIG_X86_OOSTORE
@@
-405,10
+406,6
@@
static void __init init_centaur(struct cpuinfo_x86 *c)
winchip2_protect_mcr();
#endif
break;
winchip2_protect_mcr();
#endif
break;
- case 10:
- name="4";
- /* no info on the WC4 yet */
- break;
default:
name="??";
}
default:
name="??";
}
@@
-474,3
+471,11
@@
int __init centaur_init_cpu(void)
}
//early_arch_initcall(centaur_init_cpu);
}
//early_arch_initcall(centaur_init_cpu);
+
+static int __init centaur_exit_cpu(void)
+{
+ cpu_devs[X86_VENDOR_CENTAUR] = NULL;
+ return 0;
+}
+
+late_initcall(centaur_exit_cpu);