---

yaml --- r: 136595 b: refs/heads/master c: 1322a2e h: refs/heads/master i: 136593: 0aa50d5 136591: 2468633 v: v3
git-mirror · Jan 28, 2009 · f2c2381 · f2c2381
1 parent 5330f02
commit f2c2381
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f836405ef632ba82f4a5261ff2be4198e53b51b
+refs/heads/master: 1322a2e2db87c938d8381f8501af9a4d0eab8bc7
diff --git a/trunk/arch/x86/kernel/mpparse.c b/trunk/arch/x86/kernel/mpparse.c
@@ -292,16 +292,7 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
 		return 0;
 
 #ifdef CONFIG_X86_32
-	/*
-	 * need to make sure summit and es7000's mps_oem_check is safe to be
-	 * called early via genericarch 's mps_oem_check
-	 */
-	if (early) {
-#ifdef CONFIG_X86_NUMAQ
-		numaq_mps_oem_check(mpc, oem, str);
-#endif
-	} else
-		mps_oem_check(mpc, oem, str);
+	mps_oem_check(mpc, oem, str);
 #endif
 	/* save the local APIC address, it might be non-default */
 	if (!acpi_lapic)