From 816fff53fdbaafcd152dc7559251c068576c1e4e Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Wed, 28 May 2008 17:09:53 -0700 Subject: [PATCH] --- yaml --- r: 99851 b: refs/heads/master c: 0f385d1ddd0952e01a968bfa5512378ad23de6df h: refs/heads/master i: 99849: eb3a739df0f3b661160bb145b60bea89ff64534e 99847: 2bfb55e92082af4aace44485cf32aad44c0f4392 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/smpboot.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fafc463e980c..b0fefe45847e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e9704739daf46a8ba6593d749c67b5f7cd633d2 +refs/heads/master: 0f385d1ddd0952e01a968bfa5512378ad23de6df diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c index 2a0d39f3f2f1..a74a261c5626 100644 --- a/trunk/arch/x86/kernel/smpboot.c +++ b/trunk/arch/x86/kernel/smpboot.c @@ -1052,9 +1052,8 @@ static __init void disable_smp(void) { cpu_present_map = cpumask_of_cpu(0); cpu_possible_map = cpumask_of_cpu(0); -#ifdef CONFIG_X86_32 smpboot_clear_io_apic_irqs(); -#endif + if (smp_found_config) physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map); else