ARM: ensure all sched_clock() implementations are notrace marked

[pandora-kernel.git] / arch / arm / mach-pxa / time.c

diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c
index 293e40a..b8d9dff 100644 (file)
--- a/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.c
@@ -51,7 +51,7 @@ static void __init set_oscr2ns_scale(unsigned long oscr_rate)
                oscr2ns_scale++;
 }
 
-unsigned long long sched_clock(void)
+unsigned long long notrace sched_clock(void)
 {
        unsigned long long v = cnt32_to_63(OSCR);
        return (v * oscr2ns_scale) >> OSCR2NS_SCALE_FACTOR;
@@ -127,7 +127,6 @@ static struct clocksource cksrc_pxa_oscr0 = {
        .rating         = 200,
        .read           = pxa_read_oscr,
        .mask           = CLOCKSOURCE_MASK(32),
-       .shift          = 20,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -155,12 +154,9 @@ static void __init pxa_timer_init(void)
                clockevent_delta2ns(MIN_OSCR_DELTA * 2, &ckevt_pxa_osmr0) + 1;
        ckevt_pxa_osmr0.cpumask = cpumask_of(0);
 
-       cksrc_pxa_oscr0.mult =
-               clocksource_hz2mult(clock_tick_rate, cksrc_pxa_oscr0.shift);
-
        setup_irq(IRQ_OST0, &pxa_ost0_irq);
 
-       clocksource_register(&cksrc_pxa_oscr0);
+       clocksource_register_hz(&cksrc_pxa_oscr0, clock_tick_rate);
        clockevents_register_device(&ckevt_pxa_osmr0);
 }