diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /arch/ppc/kernel/smp.c | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/ppc/kernel/smp.c')
| -rw-r--r-- | arch/ppc/kernel/smp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ppc/kernel/smp.c b/arch/ppc/kernel/smp.c index bc5bf1124836..43b8fc2ca591 100644 --- a/arch/ppc/kernel/smp.c +++ b/arch/ppc/kernel/smp.c | |||
| @@ -341,6 +341,7 @@ int __devinit start_secondary(void *unused) | |||
| 341 | cpu = smp_processor_id(); | 341 | cpu = smp_processor_id(); |
| 342 | smp_store_cpu_info(cpu); | 342 | smp_store_cpu_info(cpu); |
| 343 | set_dec(tb_ticks_per_jiffy); | 343 | set_dec(tb_ticks_per_jiffy); |
| 344 | preempt_disable(); | ||
| 344 | cpu_callin_map[cpu] = 1; | 345 | cpu_callin_map[cpu] = 1; |
| 345 | 346 | ||
| 346 | printk("CPU %d done callin...\n", cpu); | 347 | printk("CPU %d done callin...\n", cpu); |