Merge branch 'topic/asoc' into for-linus

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / i8253.c

diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c
index e325cfe06401f61c1772b686705b762cdb6370d1..10f92fb532f34e1c0e0c6a93059fa845eed7049c 100644 (file)
--- a/arch/x86/kernel/i8253.c
+++ b/arch/x86/kernel/i8253.c
@@ -114,8 +114,9 @@ void __init setup_pit_timer(void)
         * Start pit with the boot cpu mask and make it global after the
         * IO_APIC has been initialized.
         */
-       pit_clockevent.cpumask = cpumask_of_cpu(smp_processor_id());
-       pit_clockevent.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, 32);
+       pit_clockevent.cpumask = cpumask_of(smp_processor_id());
+       pit_clockevent.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC,
+                                    pit_clockevent.shift);
        pit_clockevent.max_delta_ns =
                clockevent_delta2ns(0x7FFF, &pit_clockevent);
        pit_clockevent.min_delta_ns =