patch-2.4.0-test10 linux/arch/i386/kernel/microcode.c
Next file: linux/arch/i386/kernel/mtrr.c
Previous file: linux/arch/i386/kernel/i8259.c
Back to the patch index
Back to the overall index
- Lines: 27
- Date:
Mon Oct 30 14:44:29 2000
- Orig file:
v2.4.0-test9/linux/arch/i386/kernel/microcode.c
- Orig date:
Thu Sep 7 09:16:12 2000
diff -u --recursive --new-file v2.4.0-test9/linux/arch/i386/kernel/microcode.c linux/arch/i386/kernel/microcode.c
@@ -177,7 +177,7 @@
req->err = 1; /* assume the worst */
- if (c->x86_vendor != X86_VENDOR_INTEL || c->x86 < 6){
+ if (c->x86_vendor != X86_VENDOR_INTEL || c->x86 != 6){
printk(KERN_ERR "microcode: CPU%d not an Intel P6\n", cpu_num);
return;
}
@@ -198,11 +198,15 @@
wrmsr(0x8B, 0, 0);
__asm__ __volatile__ ("cpuid" : : : "ax", "bx", "cx", "dx");
rdmsr(0x8B, val[0], rev);
- if (microcode[i].rev <= rev) {
+ if (microcode[i].rev < rev) {
printk(KERN_ERR
"microcode: CPU%d not 'upgrading' to earlier revision"
" %d (current=%d)\n", cpu_num, microcode[i].rev, rev);
- } else {
+ } else if (microcode[i].rev == rev) {
+ printk(KERN_ERR
+ "microcode: CPU%d already up-to-date (revision %d)\n",
+ cpu_num, rev);
+ } else {
int sum = 0;
struct microcode *m = µcode[i];
unsigned int *sump = (unsigned int *)(m+1);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)