patch-2.2.18 linux/include/asm-i386/bugs.h

• Lines: 24
• Date: Sat Nov 18 19:52:43 2000
• Orig file: v2.2.17/include/asm-i386/bugs.h
• Orig date: Fri Apr 21 23:10:16 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/include/asm-i386/bugs.h linux/include/asm-i386/bugs.h
@@ -330,7 +330,7 @@
 		if (ccr5 & 2) { /* possible wrong calibration done */
 			printk(KERN_INFO "Recalibrating delay loop with SLOP bit reset\n");
 			calibrate_delay();
-			boot_cpu_data.loops_per_sec = loops_per_sec;
+			boot_cpu_data.loops_per_jiffy = loops_per_jiffy;
 		}
 	}
 }
@@ -419,5 +419,13 @@
 	check_amd_k6();
 	check_pentium_f00f();
 	check_cyrix_coma();
-	system_utsname.machine[1] = '0' + boot_cpu_data.x86;
+	/*
+	 *	Catch people using stupid model number data
+	 *	(Pentium IV) and report 686 still. The /proc data
+	 *	however does not lie and reports 15 as will cpuid.
+	 */
+	if(boot_cpu_data.x86 > 9)
+		system_utsname.machine[1] = '6';
+	else
+		system_utsname.machine[1] = '0' + boot_cpu_data.x86;
 }