diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-12-13 01:43:58 -0800 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-01-14 10:19:59 -0800 |
| commit | 3ade4f81ae0c32c0c82fad93de92df07f24a85a4 (patch) | |
| tree | 84edc2b837408bc7555a9a5a411a162d16e34f28 /arch/xtensa/kernel | |
| parent | 49b424fedaf88d0fa9913082b8c1ccd012a8a972 (diff) | |
| download | linux-3ade4f81ae0c32c0c82fad93de92df07f24a85a4.tar.gz linux-3ade4f81ae0c32c0c82fad93de92df07f24a85a4.tar.bz2 linux-3ade4f81ae0c32c0c82fad93de92df07f24a85a4.zip | |
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>
Diffstat (limited to 'arch/xtensa/kernel')
| -rw-r--r-- | arch/xtensa/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); } /* |