]> asedeno.scripts.mit.edu Git - linux.git/blobdiff - drivers/clocksource/timer-mp-csky.c
Merge tag 'asoc-fix-v5.4-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git...
[linux.git] / drivers / clocksource / timer-mp-csky.c
index a8acc431a774c61cd526abe4c945acd2b7f301cb..183a9955160a80dd89bdc2d2c82cd358a487c6e9 100644 (file)
@@ -79,11 +79,11 @@ static int csky_mptimer_starting_cpu(unsigned int cpu)
 
        to->clkevt.cpumask = cpumask_of(cpu);
 
+       enable_percpu_irq(csky_mptimer_irq, 0);
+
        clockevents_config_and_register(&to->clkevt, timer_of_rate(to),
                                        2, ULONG_MAX);
 
-       enable_percpu_irq(csky_mptimer_irq, 0);
-
        return 0;
 }
 
@@ -97,7 +97,7 @@ static int csky_mptimer_dying_cpu(unsigned int cpu)
 /*
  * clock source
  */
-static u64 sched_clock_read(void)
+static u64 notrace sched_clock_read(void)
 {
        return (u64)mfcr(PTIM_CCVR);
 }