Quellcode durchsuchen

ARM: iop: 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.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Stephen Boyd vor 11 Jahren
Ursprung
Commit
c66af54139
1 geänderte Dateien mit 2 neuen und 2 gelöschten Zeilen
  1. 2 2
      arch/arm/plat-iop/time.c

+ 2 - 2
arch/arm/plat-iop/time.c

@@ -54,7 +54,7 @@ static struct clocksource iop_clocksource = {
 /*
 /*
  * IOP sched_clock() implementation via its clocksource.
  * IOP sched_clock() implementation via its clocksource.
  */
  */
-static u32 notrace iop_read_sched_clock(void)
+static u64 notrace iop_read_sched_clock(void)
 {
 {
 	return 0xffffffffu - read_tcr1();
 	return 0xffffffffu - read_tcr1();
 }
 }
@@ -142,7 +142,7 @@ void __init iop_init_time(unsigned long tick_rate)
 {
 {
 	u32 timer_ctl;
 	u32 timer_ctl;
 
 
-	setup_sched_clock(iop_read_sched_clock, 32, tick_rate);
+	sched_clock_register(iop_read_sched_clock, 32, tick_rate);
 
 
 	ticks_per_jiffy = DIV_ROUND_CLOSEST(tick_rate, HZ);
 	ticks_per_jiffy = DIV_ROUND_CLOSEST(tick_rate, HZ);
 	iop_tick_rate = tick_rate;
 	iop_tick_rate = tick_rate;