diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 03:00:06 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 03:00:06 -0400 |
| commit | 4c8440666b995f20604852b35dcfdbcc1d5931f1 (patch) | |
| tree | b3b6cd65ee275ba1adf9d2c050063f30ebbadb91 /arch/powerpc/kernel/smp.c | |
| parent | 751e1f5099f1568444fe2485f2485ca541d4952e (diff) | |
| parent | c560bbceaf6b06e52f1ef20131b76a3fdc0a2c19 (diff) | |
Merge branch 'merge' into next
Diffstat (limited to 'arch/powerpc/kernel/smp.c')
| -rw-r--r-- | arch/powerpc/kernel/smp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index a8909aa50642..dd1973fed304 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c | |||
| @@ -458,8 +458,6 @@ int __cpuinit __cpu_up(unsigned int cpu) | |||
| 458 | { | 458 | { |
| 459 | int rc, c; | 459 | int rc, c; |
| 460 | 460 | ||
| 461 | secondary_ti = current_set[cpu]; | ||
| 462 | |||
| 463 | if (smp_ops == NULL || | 461 | if (smp_ops == NULL || |
| 464 | (smp_ops->cpu_bootable && !smp_ops->cpu_bootable(cpu))) | 462 | (smp_ops->cpu_bootable && !smp_ops->cpu_bootable(cpu))) |
| 465 | return -EINVAL; | 463 | return -EINVAL; |
| @@ -469,6 +467,8 @@ int __cpuinit __cpu_up(unsigned int cpu) | |||
| 469 | if (rc) | 467 | if (rc) |
| 470 | return rc; | 468 | return rc; |
| 471 | 469 | ||
| 470 | secondary_ti = current_set[cpu]; | ||
| 471 | |||
| 472 | /* Make sure callin-map entry is 0 (can be leftover a CPU | 472 | /* Make sure callin-map entry is 0 (can be leftover a CPU |
| 473 | * hotplug | 473 | * hotplug |
| 474 | */ | 474 | */ |