drm/amdgpu: disable GFX CGCG in aldebaran

[linux-2.6-microblaze.git] / drivers / clocksource / timer-mp-csky.c

diff --git a/drivers/clocksource/timer-mp-csky.c b/drivers/clocksource/timer-mp-csky.c
index a8acc43..183a995 100644 (file)
--- a/drivers/clocksource/timer-mp-csky.c
+++ b/drivers/clocksource/timer-mp-csky.c
@@ -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);
 }