===== arch/i386/kernel/apic.c 1.60 vs 1.61 =====
--- 1.60/arch/i386/kernel/apic.c	2004-10-06 21:10:37 -04:00
+++ 1.61/arch/i386/kernel/apic.c	2004-10-10 04:12:38 -04:00
@@ -690,22 +690,8 @@
 		goto no_apic;
 	}
 
-	if (!cpu_has_apic) {
-		/*
-		 * Some BIOSes disable the local APIC in the
-		 * APIC_BASE MSR. This can only be done in
-		 * software for Intel P6 and AMD K7 (Model > 1).
-		 */
-		rdmsr(MSR_IA32_APICBASE, l, h);
-		if (!(l & MSR_IA32_APICBASE_ENABLE)) {
-			apic_printk(APIC_VERBOSE, "Local APIC disabled "
-					"by BIOS -- reenabling.\n");
-			l &= ~MSR_IA32_APICBASE_BASE;
-			l |= MSR_IA32_APICBASE_ENABLE | APIC_DEFAULT_PHYS_BASE;
-			wrmsr(MSR_IA32_APICBASE, l, h);
-			enabled_via_apicbase = 1;
-		}
-	}
+	if (!cpu_has_apic)
+		goto no_apic;
 	/*
 	 * The APIC feature bit should now be enabled
 	 * in `cpuid'