From 3ade4f81ae0c32c0c82fad93de92df07f24a85a4 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Fri, 13 Dec 2013 01:43:58 -0800 Subject: 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 Acked-by: Max Filippov Signed-off-by: Chris Zankel --- arch/xtensa/kernel/time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/xtensa/kernel/time.c') diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index 60dcb3fcaeae..1fb49a355568 100644 --- 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); } /* -- cgit