diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 15:26:15 -0800 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-11-21 15:41:00 -0800 |
commit | e5c0228d61f5802a14be901ae7fb97781c125987 (patch) | |
tree | f9504ce1d0a6fbf411191a2c4426f68ca584f2e5 /arch/arm/mach-mmp | |
parent | bf3eb44f9805061209d34c8b24cd455c50d1fd62 (diff) | |
download | linux-stable-e5c0228d61f5802a14be901ae7fb97781c125987.tar.gz linux-stable-e5c0228d61f5802a14be901ae7fb97781c125987.tar.bz2 linux-stable-e5c0228d61f5802a14be901ae7fb97781c125987.zip |
ARM: mmp: 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.
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/mach-mmp')
-rw-r--r-- | arch/arm/mach-mmp/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c index 7ac41e83cfef..024022d91fe3 100644 --- a/arch/arm/mach-mmp/time.c +++ b/arch/arm/mach-mmp/time.c @@ -61,7 +61,7 @@ static inline uint32_t timer_read(void) return __raw_readl(mmp_timer_base + TMR_CVWR(1)); } -static u32 notrace mmp_read_sched_clock(void) +static u64 notrace mmp_read_sched_clock(void) { return timer_read(); } @@ -195,7 +195,7 @@ void __init timer_init(int irq) { timer_config(); - setup_sched_clock(mmp_read_sched_clock, 32, CLOCK_TICK_RATE); + sched_clock_register(mmp_read_sched_clock, 32, CLOCK_TICK_RATE); ckevt.cpumask = cpumask_of(0); |