diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /arch/powerpc/kernel/smp.c | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/powerpc/kernel/smp.c')
| -rw-r--r-- | arch/powerpc/kernel/smp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index c8458c531b25..13595a64f013 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c | |||
| @@ -540,6 +540,9 @@ int __devinit start_secondary(void *unused) | |||
| 540 | if (smp_ops->take_timebase) | 540 | if (smp_ops->take_timebase) |
| 541 | smp_ops->take_timebase(); | 541 | smp_ops->take_timebase(); |
| 542 | 542 | ||
| 543 | if (system_state > SYSTEM_BOOTING) | ||
| 544 | per_cpu(last_jiffy, cpu) = get_tb(); | ||
| 545 | |||
| 543 | spin_lock(&call_lock); | 546 | spin_lock(&call_lock); |
| 544 | cpu_set(cpu, cpu_online_map); | 547 | cpu_set(cpu, cpu_online_map); |
| 545 | spin_unlock(&call_lock); | 548 | spin_unlock(&call_lock); |