patch-2.4.6 linux/arch/i386/kernel/bluesmoke.c

• Lines: 35
• Date: Sun Jul 1 19:52:45 2001
• Orig file: v2.4.5/linux/arch/i386/kernel/bluesmoke.c
• Orig date: Mon May 21 12:34:50 2001

diff -u --recursive --new-file v2.4.5/linux/arch/i386/kernel/bluesmoke.c linux/arch/i386/kernel/bluesmoke.c
@@ -182,7 +182,7 @@
  *	Set up machine check reporting on the Winchip C6 series
  */
  
-static void winchip_mcheck_init(struct cpuinfo_x86 *c)
+static void __init winchip_mcheck_init(struct cpuinfo_x86 *c)
 {
 	u32 lo, hi;
 	/* Not supported on C3 */
@@ -207,8 +207,14 @@
  *	This has to be run for each processor
  */
 
+
+static int mce_disabled = 0;
+
 void __init mcheck_init(struct cpuinfo_x86 *c)
 {
+	if(mce_disabled)
+		return;
+		
 	switch(c->x86_vendor)
 	{
 		case X86_VENDOR_AMD:
@@ -226,3 +232,10 @@
 			break;
 	}
 }
+
+static int __init mcheck_disable(char *str)
+{
+	mce_disabled = 1;
+	return 1;
+}
+__setup("nomce", mcheck_disable);