diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 18:26:25 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-11-21 18:41:01 -0500 |
commit | d25f1d5a30697e038aaa9eac7172de416b01df33 (patch) | |
tree | 9303e7bf9fa7ec67ab467ad6faa52894681debdd /arch/arm | |
parent | b44653baed01d63fb7de5378ad717158a51e83ce (diff) |
ARM: versatile: 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: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/plat-versatile/sched-clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-versatile/sched-clock.c b/arch/arm/plat-versatile/sched-clock.c index 51b109e3b6c3..c966ae90f4a0 100644 --- a/arch/arm/plat-versatile/sched-clock.c +++ b/arch/arm/plat-versatile/sched-clock.c | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | static void __iomem *ctr; | 27 | static void __iomem *ctr; |
28 | 28 | ||
29 | static u32 notrace versatile_read_sched_clock(void) | 29 | static u64 notrace versatile_read_sched_clock(void) |
30 | { | 30 | { |
31 | if (ctr) | 31 | if (ctr) |
32 | return readl(ctr); | 32 | return readl(ctr); |
@@ -37,5 +37,5 @@ static u32 notrace versatile_read_sched_clock(void) | |||
37 | void __init versatile_sched_clock_init(void __iomem *reg, unsigned long rate) | 37 | void __init versatile_sched_clock_init(void __iomem *reg, unsigned long rate) |
38 | { | 38 | { |
39 | ctr = reg; | 39 | ctr = reg; |
40 | setup_sched_clock(versatile_read_sched_clock, 32, rate); | 40 | sched_clock_register(versatile_read_sched_clock, 32, rate); |
41 | } | 41 | } |