From f2c23811caa519d0f34ccb9b03eb6bf320df4213 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 28 Jan 2009 13:54:56 +0100 Subject: [PATCH] --- yaml --- r: 136595 b: refs/heads/master c: 1322a2e2db87c938d8381f8501af9a4d0eab8bc7 h: refs/heads/master i: 136593: 0aa50d5d486e720cae5100cc2b3f18efd8f5cf8f 136591: 24686335eb6c13a4e20e23d2d7218e231f79d0f7 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/mpparse.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 0964bac019a7..285652104035 100644 --- 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 index c8a534a16d98..f6fb1928439d 100644 --- 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)