diff options
| author |   Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 15:26:19 -0800 |
|---|---|---|
| committer |   Kevin Hilman <khilman@linaro.org> | 2013-11-21 15:41:00 -0800 |
| commit | 364ed1e0ab019d83ae08c9de06b3ec576e0c17c6 (patch) | |
| tree | 61039da65e3a66be00511a318444ef37efaa953c | |
| parent | ARM: OMAP2+: Switch to sched_clock_register() (diff) | |
| download | linux-dev-364ed1e0ab019d83ae08c9de06b3ec576e0c17c6.tar.xz linux-dev-364ed1e0ab019d83ae08c9de06b3ec576e0c17c6.zip | |
ARM: pxa: 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: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
| -rw-r--r-- | arch/arm/mach-pxa/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index 9aa852a8fab9..d1bfaa73b1c9 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c @@ -33,7 +33,7 @@ * calls to sched_clock() which should always be the case in practice. */ -static u32 notrace pxa_read_sched_clock(void) +static u64 notrace pxa_read_sched_clock(void) { return readl_relaxed(OSCR); } @@ -149,7 +149,7 @@ void __init pxa_timer_init(void) writel_relaxed(0, OIER); writel_relaxed(OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3, OSSR); - setup_sched_clock(pxa_read_sched_clock, 32, clock_tick_rate); + sched_clock_register(pxa_read_sched_clock, 32, clock_tick_rate); ckevt_pxa_osmr0.cpumask = cpumask_of(0); |