aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/smp.c
diff options
context:
space:
mode:
authorTiejun Chen <tiejun.chen@windriver.com>2010-07-15 16:17:11 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-07-31 00:56:31 -0400
commitd77cb21b578a5428482bc0fd187f7c0518a0b32a (patch)
tree15a14c874d90bb1e92ed674c05fe87c4c20baded /arch/powerpc/kernel/smp.c
parent1927445a7376e183072e6147a9641088b9b6a30e (diff)
powerpc/smp: remove the incorrect decrementer initial codes for AP
We already defined start_cpu_decrementer() to invoke decrementer for AP as the following path: start_secondary() -> secondary_cpu_time_init() -> start_cpu_decrementer() So remove these incorrect codes introduced from commit: e7f75ad0 powerpc/47x: Base ppc476 support And actually we really should not enable decrementer before calling set_dec(). Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/smp.c')
-rw-r--r--arch/powerpc/kernel/smp.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 8764daad309b..a61b3ddd7bb3 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -499,14 +499,6 @@ int __devinit start_secondary(void *unused)
499 current->active_mm = &init_mm; 499 current->active_mm = &init_mm;
500 500
501 smp_store_cpu_info(cpu); 501 smp_store_cpu_info(cpu);
502
503#if defined(CONFIG_BOOKE) || defined(CONFIG_40x)
504 /* Clear any pending timer interrupts */
505 mtspr(SPRN_TSR, TSR_ENW | TSR_WIS | TSR_DIS | TSR_FIS);
506
507 /* Enable decrementer interrupt */
508 mtspr(SPRN_TCR, TCR_DIE);
509#endif
510 set_dec(tb_ticks_per_jiffy); 502 set_dec(tb_ticks_per_jiffy);
511 preempt_disable(); 503 preempt_disable();
512 cpu_callin_map[cpu] = 1; 504 cpu_callin_map[cpu] = 1;