Merge branches 'sched/clock', 'sched/cleanups' and 'linus' into sched/urgent

[mv-sheeva.git] / arch / mips / sni / time.c

diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c
index 6f339af08d225a50b0dd6a6712aa30adf0f723e0..69f5f88711cca8721cbc97ad4fda96e6682ecffd 100644 (file)
--- a/arch/mips/sni/time.c
+++ b/arch/mips/sni/time.c
@@ -80,7 +80,7 @@ static void __init sni_a20r_timer_setup(void)
        struct irqaction *action = &a20r_irqaction;
        unsigned int cpu = smp_processor_id();
 
-       cd->cpumask             = cpumask_of_cpu(cpu);
+       cd->cpumask             = cpumask_of(cpu);
        clockevents_register_device(cd);
        action->dev_id = cd;
        setup_irq(SNI_A20R_IRQ_TIMER, &a20r_irqaction);
@@ -178,6 +178,7 @@ void __init plat_time_init(void)
                sni_a20r_timer_setup();
                break;
        }
+       setup_pit_timer();
 }
 
 unsigned long read_persistent_clock(void)