diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-07-18 16:21:24 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-07-30 11:24:53 -0700 |
| commit | e25bc5f5ad192cf8782db64acb83962a0b27c4e0 (patch) | |
| tree | baf6c50d2a96ca80af8a4816f1ba8c9bbf499837 /drivers/clocksource | |
| parent | fcfca6ef6a35690648de6529b607674d4132b10e (diff) | |
| download | linux-e25bc5f5ad192cf8782db64acb83962a0b27c4e0.tar.gz linux-e25bc5f5ad192cf8782db64acb83962a0b27c4e0.tar.bz2 linux-e25bc5f5ad192cf8782db64acb83962a0b27c4e0.zip | |
clocksource: nomadik: 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: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/nomadik-mtu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c index 7d2c2c56f73c..2242cd3d618d 100644 --- a/drivers/clocksource/nomadik-mtu.c +++ b/drivers/clocksource/nomadik-mtu.c @@ -76,7 +76,7 @@ static struct delay_timer mtu_delay_timer; * local implementation which uses the clocksource to get some * better resolution when scheduling the kernel. */ -static u32 notrace nomadik_read_sched_clock(void) +static u64 notrace nomadik_read_sched_clock(void) { if (unlikely(!mtu_base)) return 0; @@ -230,7 +230,7 @@ static void __init __nmdk_timer_init(void __iomem *base, int irq, "mtu_0"); #ifdef CONFIG_CLKSRC_NOMADIK_MTU_SCHED_CLOCK - setup_sched_clock(nomadik_read_sched_clock, 32, rate); + sched_clock_register(nomadik_read_sched_clock, 32, rate); #endif /* Timer 1 is used for events, register irq and clockevents */ |