patch-1.3.77 linux/arch/i386/kernel/setup.c

Next file: linux/drivers/cdrom/cdu31a.c
Previous file: linux/arch/i386/boot/video.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.76/linux/arch/i386/kernel/setup.c linux/arch/i386/kernel/setup.c
@@ -232,8 +232,10 @@
 	switch (x86) {
 		case 4:
 			p = i486model(model);
+			break;
 		case 5:
 			p = i586model(model);
+			break;
 	}
         if (p)
                 return p;
@@ -255,7 +257,9 @@
 #ifdef __SMP__
         int n;
 
-#define CD(X) (cpu_data[n].(X))
+#define CD(X)		(cpu_data[n].X)
+/* SMP has the wrong name for loops_per_sec */
+#define loops_per_sec	udelay_val
 #define CPUN n
 
         for ( n = 0 ; n < 32 ; n++ ) {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this