--- include/asm-i386/cpufeature.h.old	Wed Nov 15 11:24:21 2000
+++ include/asm-i386/cpufeature.h	Wed Nov 15 11:35:10 2000
@@ -20,7 +20,7 @@
 #define X86_FEATURE_TSC		(0*32+ 4) /* Time Stamp Counter */
 #define X86_FEATURE_MSR		(0*32+ 5) /* Model-Specific Registers, RDMSR, WRMSR */
 #define X86_FEATURE_PAE		(0*32+ 6) /* Physical Address Extensions */
-#define X86_FEATURE_MCE		(0*32+ 7) /* Machine Check Architecture */
+#define X86_FEATURE_MCE		(0*32+ 7) /* Machine Check Exception */
 #define X86_FEATURE_CX8		(0*32+ 8) /* CMPXCHG8 instruction */
 #define X86_FEATURE_APIC	(0*32+ 9) /* Onboard APIC */
 #define X86_FEATURE_SEP		(0*32+11) /* SYSENTER/SYSEXIT */
--- arch/i386/kernel/bluesmoke.c.old	Wed Nov 15 11:31:55 2000
+++ arch/i386/kernel/bluesmoke.c	Wed Nov 15 11:34:21 2000
@@ -72,10 +72,12 @@
 	int i;
 	static int done;
 
-	if( c->x86_vendor != X86_VENDOR_INTEL )
-		return;
-	
-	if( !test_bit(X86_FEATURE_TSC, &c->x86_capability) )
+	/* We should not check for vendor here.  The MCA capability
+	   bit, below, should only be set if the CPU has the Intel
+	   Machine Check Architecture (it's up to identify_cpu() to
+	   make sure that is true! */
+
+	if( !test_bit(X86_FEATURE_MCE, &c->x86_capability) )
 		return;
 		
 	if( !test_bit(X86_FEATURE_MCA, &c->x86_capability) )
--- arch/i386/kernel/setup.c.old	Wed Nov 15 11:24:19 2000
+++ arch/i386/kernel/setup.c	Wed Nov 15 11:37:38 2000
@@ -1483,7 +1483,6 @@
 #ifndef CONFIG_M686
 	static int f00f_workaround_enabled = 0;
 #endif
-	extern void mcheck_init(struct cpuinfo_x86 *c);
 	char *p = NULL;
 
 #ifndef CONFIG_M686
@@ -1575,9 +1574,6 @@
 
 	if ( p )
 		strcpy(c->x86_model_id, p);
-
-	/* Enable MCA if available */
-	mcheck_init(c);
 }
 
 void __init get_cpu_vendor(struct cpuinfo_x86 *c)
@@ -1797,6 +1793,8 @@
 	return have_cpuid_p();	/* Check to see if CPUID now enabled? */
 }
 
+extern void mcheck_init(struct cpuinfo_x86 *c);
+
 /*
  * This does the hard work of actually picking apart the CPU stuff...
  */
@@ -1919,6 +1917,9 @@
 	 * The vendor-specific functions might have changed features.  Now
 	 * we do "generic changes."
 	 */
+
+	/* Enable Machine Check Architecture if appropriate */
+	mcheck_init(c);
 
 	/* TSC disabled? */
 #ifdef CONFIG_TSC