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

Next file: linux/drivers/block/floppy.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.78/linux/arch/i386/kernel/setup.c linux/arch/i386/kernel/setup.c
@@ -225,6 +225,16 @@
 	return NULL;
 }
 
+static const char * i686model(unsigned int nr)
+{
+	static const char *model[] = {
+		"PPro A-step", "Pentium Pro"
+	};
+	if (nr < sizeof(model)/sizeof(char *))
+		return model[nr];
+	return NULL;
+}
+
 static const char * getmodel(int x86, int model)
 {
         const char *p = NULL;
@@ -236,6 +246,9 @@
 		case 5:
 			p = i586model(model);
 			break;
+		case 6:
+			p = i686model(model);
+			break;
 	}
         if (p)
                 return p;
@@ -294,12 +307,15 @@
                                        "fdiv_bug\t: %s\n"
                                        "hlt_bug\t\t: %s\n"
                                        "fpu\t\t: %s\n"
+                                       "fpu_exception\t: %s\n"
                                        "cpuid\t\t: %s\n"
                                        "wp\t\t: %s\n"
                                        "flags\t\t:",
                                        CD(fdiv_bug) ? "yes" : "no",
                                        CD(hlt_works_ok) ? "no" : "yes",
                                        CD(hard_math) ? "yes" : "no",
+                                       (CD(hard_math) && ignore_irq13)
+                                         ? "yes" : "no",
                                        CD(have_cpuid) ? "yes" : "no",
                                        CD(wp_works_ok) ? "yes" : "no");
         

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