projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b93767e
)
ARM: integrator: Switch to sched_clock_register()
author
Stephen Boyd
<sboyd@codeaurora.org>
Fri, 15 Nov 2013 23:26:13 +0000
(15:26 -0800)
committer
Kevin Hilman
<khilman@linaro.org>
Thu, 21 Nov 2013 23:41:00 +0000
(15:41 -0800)
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: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
arch/arm/mach-integrator/integrator_ap.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-integrator/integrator_ap.c
b/arch/arm/mach-integrator/integrator_ap.c
index
d50dc2d
..
473e21b
100644
(file)
--- a/
arch/arm/mach-integrator/integrator_ap.c
+++ b/
arch/arm/mach-integrator/integrator_ap.c
@@
-277,7
+277,7
@@
struct amba_pl010_data ap_uart_data = {
static unsigned long timer_reload;
-static u
32
notrace integrator_read_sched_clock(void)
+static u
64
notrace integrator_read_sched_clock(void)
{
return -readl((void __iomem *) TIMER2_VA_BASE + TIMER_VALUE);
}
@@
-298,7
+298,7
@@
static void integrator_clocksource_init(unsigned long inrate,
clocksource_mmio_init(base + TIMER_VALUE, "timer2",
rate, 200, 16, clocksource_mmio_readl_down);
- s
etup_sched_clock
(integrator_read_sched_clock, 16, rate);
+ s
ched_clock_register
(integrator_read_sched_clock, 16, rate);
}
static void __iomem * clkevt_base;