From: Stephen Boyd Date: Fri, 15 Nov 2013 23:26:24 +0000 (-0800) Subject: ARM: orion: Switch to sched_clock_register() X-Git-Tag: v3.14-rc1~113^2~25^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b44653baed01d63fb7de5378ad717158a51e83ce;p=kernel%2Fkernel-generic.git ARM: orion: 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: Andrew Lunn Signed-off-by: Stephen Boyd Acked-by: Jason Cooper Signed-off-by: Kevin Hilman --- diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c index 9d2b2ac..dade292 100644 --- a/arch/arm/plat-orion/time.c +++ b/arch/arm/plat-orion/time.c @@ -60,7 +60,7 @@ static u32 ticks_per_jiffy; * at least 7.5ns (133MHz TCLK). */ -static u32 notrace orion_read_sched_clock(void) +static u64 notrace orion_read_sched_clock(void) { return ~readl(timer_base + TIMER0_VAL_OFF); } @@ -201,7 +201,7 @@ orion_time_init(void __iomem *_bridge_base, u32 _bridge_timer1_clr_mask, /* * Set scale and timer for sched_clock. */ - setup_sched_clock(orion_read_sched_clock, 32, tclk); + sched_clock_register(orion_read_sched_clock, 32, tclk); /* * Setup free-running clocksource timer (interrupts