|
@@ -33,7 +33,7 @@
|
|
* calls to sched_clock() which should always be the case in practice.
|
|
* calls to sched_clock() which should always be the case in practice.
|
|
*/
|
|
*/
|
|
|
|
|
|
-static u32 notrace pxa_read_sched_clock(void)
|
|
|
|
|
|
+static u64 notrace pxa_read_sched_clock(void)
|
|
{
|
|
{
|
|
return readl_relaxed(OSCR);
|
|
return readl_relaxed(OSCR);
|
|
}
|
|
}
|
|
@@ -149,7 +149,7 @@ void __init pxa_timer_init(void)
|
|
writel_relaxed(0, OIER);
|
|
writel_relaxed(0, OIER);
|
|
writel_relaxed(OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3, OSSR);
|
|
writel_relaxed(OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3, OSSR);
|
|
|
|
|
|
- setup_sched_clock(pxa_read_sched_clock, 32, clock_tick_rate);
|
|
|
|
|
|
+ sched_clock_register(pxa_read_sched_clock, 32, clock_tick_rate);
|
|
|
|
|
|
ckevt_pxa_osmr0.cpumask = cpumask_of(0);
|
|
ckevt_pxa_osmr0.cpumask = cpumask_of(0);
|
|
|
|
|