xtensa: Switch to sched_clock_register()

The 32 bit sched_clock interface now supports 64 bits. Upgrade
to the 64 bit function to allow us to remove the 32 bit
registration interface.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>

diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 60dcb3fcaeae8ad978f8eeec4d073a88abb9f064..1fb49a355568c74d66824ffd6afd737dcfd33a28 100644 (file)
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -36,7 +36,7 @@ static cycle_t ccount_read(struct clocksource *cs)
        return (cycle_t)get_ccount();
 }
 
-static u32 notrace ccount_sched_clock_read(void)
+static u64 notrace ccount_sched_clock_read(void)
 {
        return get_ccount();
 }
@@ -147,7 +147,7 @@ void __init time_init(void)
        clocksource_register_hz(&ccount_clocksource, ccount_freq);
        local_timer_setup(0);
        setup_irq(this_cpu_ptr(&ccount_timer)->evt.irq, &timer_irqaction);
-       setup_sched_clock(ccount_sched_clock_read, 32, ccount_freq);
+       sched_clock_register(ccount_sched_clock_read, 32, ccount_freq);
 }
 
 /*