Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 312367
b: refs/heads/master
c: 3b6f70f
h: refs/heads/master
i:
  312365: 8893678
  312363: 7b34910
  312359: f7f6995
  312351: b602c90
v: v3
  • Loading branch information
Yong Zhang authored and Thomas Gleixner committed Jun 5, 2012
1 parent 9ebd77c commit 7bcdd5f
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8efdfc3a4ed009c978dab6609d15fb958e7cff12
refs/heads/master: 3b6f70fd7dd4e19fc674ec99e389bf0da5589525
9 changes: 0 additions & 9 deletions trunk/arch/x86/kernel/smpboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 0 additions & 2 deletions trunk/arch/x86/xen/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 7bcdd5f

Please sign in to comment.