diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 15:26:25 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-11-21 15:41:01 -0800 |
| commit | d25f1d5a30697e038aaa9eac7172de416b01df33 (patch) | |
| tree | 9303e7bf9fa7ec67ab467ad6faa52894681debdd /arch/arm/plat-versatile | |
| parent | b44653baed01d63fb7de5378ad717158a51e83ce (diff) | |
| download | op-kernel-dev-d25f1d5a30697e038aaa9eac7172de416b01df33.zip op-kernel-dev-d25f1d5a30697e038aaa9eac7172de416b01df33.tar.gz | |
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/plat-versatile')
| -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 51b109e..c966ae9 100644 --- a/arch/arm/plat-versatile/sched-clock.c +++ b/arch/arm/plat-versatile/sched-clock.c @@ -26,7 +26,7 @@ static void __iomem *ctr; -static u32 notrace versatile_read_sched_clock(void) +static u64 notrace versatile_read_sched_clock(void) { if (ctr) return readl(ctr); @@ -37,5 +37,5 @@ static u32 notrace versatile_read_sched_clock(void) void __init versatile_sched_clock_init(void __iomem *reg, unsigned long rate) { ctr = reg; - setup_sched_clock(versatile_read_sched_clock, 32, rate); + sched_clock_register(versatile_read_sched_clock, 32, rate); } |
