powerpc: Clean up obsolete code relating to decrementer and timebase

[cascardo/linux.git] / arch / powerpc / platforms / powermac / cpufreq_32.c

diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c
index 1e9eba1..415ca6d 100644 (file)
--- a/arch/powerpc/platforms/powermac/cpufreq_32.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_32.c
@@ -310,8 +310,12 @@ static int pmu_set_cpu_speed(int low_speed)
        /* Restore low level PMU operations */
        pmu_unlock();
 
-       /* Restore decrementer */
-       wakeup_decrementer();
+       /*
+        * Restore decrementer; we'll take a decrementer interrupt
+        * as soon as interrupts are re-enabled and the generic
+        * clockevents code will reprogram it with the right value.
+        */
+       set_dec(1);
 
        /* Restore interrupts */
        mpic_cpu_set_priority(pic_prio);