diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-22 14:22:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-22 14:22:15 -0400 |
| commit | 55acdddbac1725b80df0c41970505e8a41c84956 (patch) | |
| tree | cf0eeda5d382fe40ed3d14b74e9148e587282c0e /arch/parisc | |
| parent | 2eafeb6a415864bc4c59df79151cf40f6ac74b9e (diff) | |
| parent | b871a42b6091b720e82ddff237659534c525c25b (diff) | |
Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull smp/hotplug changes from Ingo Molnar:
"Various cleanups to the SMP hotplug code - a continuing effort of
Thomas et al"
* 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
smpboot: Remove leftover declaration
smp: Remove num_booting_cpus()
smp: Remove ipi_call_lock[_irq]()/ipi_call_unlock[_irq]()
POWERPC: Smp: remove call to ipi_call_lock()/ipi_call_unlock()
SPARC: SMP: Remove call to ipi_call_lock_irq()/ipi_call_unlock_irq()
ia64: SMP: Remove call to ipi_call_lock_irq()/ipi_call_unlock_irq()
x86-smp-remove-call-to-ipi_call_lock-ipi_call_unlock
tile: SMP: Remove call to ipi_call_lock()/ipi_call_unlock()
S390: Smp: remove call to ipi_call_lock()/ipi_call_unlock()
parisc: Smp: remove call to ipi_call_lock()/ipi_call_unlock()
mn10300: SMP: Remove call to ipi_call_lock()/ipi_call_unlock()
hexagon: SMP: Remove call to ipi_call_lock()/ipi_call_unlock()
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/kernel/smp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c index a47828d31fe6..6266730efd61 100644 --- a/arch/parisc/kernel/smp.c +++ b/arch/parisc/kernel/smp.c | |||
| @@ -300,9 +300,7 @@ smp_cpu_init(int cpunum) | |||
| 300 | 300 | ||
| 301 | notify_cpu_starting(cpunum); | 301 | notify_cpu_starting(cpunum); |
| 302 | 302 | ||
| 303 | ipi_call_lock(); | ||
| 304 | set_cpu_online(cpunum, true); | 303 | set_cpu_online(cpunum, true); |
| 305 | ipi_call_unlock(); | ||
| 306 | 304 | ||
| 307 | /* Initialise the idle task for this CPU */ | 305 | /* Initialise the idle task for this CPU */ |
| 308 | atomic_inc(&init_mm.mm_count); | 306 | atomic_inc(&init_mm.mm_count); |