From 7bcdd5f82d91d08a57a3fc222991a73b1b8ba163 Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Tue, 29 May 2012 15:16:01 +0800 Subject: [PATCH] --- yaml --- r: 312367 b: refs/heads/master c: 3b6f70fd7dd4e19fc674ec99e389bf0da5589525 h: refs/heads/master i: 312365: 889367896d7b07693567cea412664c251a2e6f9c 312363: 7b34910553bdf2f07437ecc8ff3e2ad77ea05498 312359: f7f6995a93ce2925602e884d48d62ab8408ec672 312351: b602c90cf6990ecc4191c24b5827de111fd40c19 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/smpboot.c | 9 --------- trunk/arch/x86/xen/smp.c | 2 -- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/[refs] b/[refs] index d8efa7e1cd92..b3bdda1a6ff9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8efdfc3a4ed009c978dab6609d15fb958e7cff12 +refs/heads/master: 3b6f70fd7dd4e19fc674ec99e389bf0da5589525 diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c index f56f96da77f5..b2fd28ff84b5 100644 --- a/trunk/arch/x86/kernel/smpboot.c +++ b/trunk/arch/x86/kernel/smpboot.c @@ -255,22 +255,13 @@ notrace static void __cpuinit start_secondary(void *unused) check_tsc_sync_target(); /* - * We need to hold call_lock, so there is no inconsistency - * between the time smp_call_function() determines number of - * IPI recipients, and the time when the determination is made - * for which cpus receive the IPI. Holding this - * lock helps us to not include this cpu in a currently in progress - * smp_call_function(). - * * We need to hold vector_lock so there the set of online cpus * does not change while we are assigning vectors to cpus. Holding * this lock ensures we don't half assign or remove an irq from a cpu. */ - ipi_call_lock(); lock_vector_lock(); set_cpu_online(smp_processor_id(), true); unlock_vector_lock(); - ipi_call_unlock(); per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE; x86_platform.nmi_init(); diff --git a/trunk/arch/x86/xen/smp.c b/trunk/arch/x86/xen/smp.c index afb250d22a6b..f58dca7a6e52 100644 --- a/trunk/arch/x86/xen/smp.c +++ b/trunk/arch/x86/xen/smp.c @@ -80,9 +80,7 @@ static void __cpuinit cpu_bringup(void) notify_cpu_starting(cpu); - ipi_call_lock(); set_cpu_online(cpu, true); - ipi_call_unlock(); this_cpu_write(cpu_state, CPU_ONLINE);