| Message ID | 1375309877-16617-7-git-send-email-sboyd@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Stephen Boyd <sboyd@codeaurora.org> writes: > 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. Don't find anything wrong in this. Acked-by: Krzysztof Halasa <khc@pm.waw.pl> > +++ b/arch/arm/mach-ixp4xx/common.c > @@ -448,7 +448,7 @@ void __init ixp4xx_sys_init(void) > /* > * sched_clock() > */ > -static u32 notrace ixp4xx_read_sched_clock(void) > +static u64 notrace ixp4xx_read_sched_clock(void) > { > return *IXP4XX_OSTS; > } > @@ -466,7 +466,7 @@ unsigned long ixp4xx_timer_freq = IXP4XX_TIMER_FREQ; > EXPORT_SYMBOL(ixp4xx_timer_freq); > static void __init ixp4xx_clocksource_init(void) > { > - setup_sched_clock(ixp4xx_read_sched_clock, 32, ixp4xx_timer_freq); > + sched_clock_register(ixp4xx_read_sched_clock, 32, ixp4xx_timer_freq); > > clocksource_mmio_init(NULL, "OSTS", ixp4xx_timer_freq, 200, 32, > ixp4xx_clocksource_read);
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index 5327dec..124631e 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c @@ -448,7 +448,7 @@ void __init ixp4xx_sys_init(void) /* * sched_clock() */ -static u32 notrace ixp4xx_read_sched_clock(void) +static u64 notrace ixp4xx_read_sched_clock(void) { return *IXP4XX_OSTS; } @@ -466,7 +466,7 @@ unsigned long ixp4xx_timer_freq = IXP4XX_TIMER_FREQ; EXPORT_SYMBOL(ixp4xx_timer_freq); static void __init ixp4xx_clocksource_init(void) { - setup_sched_clock(ixp4xx_read_sched_clock, 32, ixp4xx_timer_freq); + sched_clock_register(ixp4xx_read_sched_clock, 32, ixp4xx_timer_freq); clocksource_mmio_init(NULL, "OSTS", ixp4xx_timer_freq, 200, 32, ixp4xx_clocksource_read);
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: Imre Kaloz <kaloz@openwrt.org> Cc: Krzysztof Halasa <khc@pm.waw.pl> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm/mach-ixp4xx/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)