Merge with temp tree to get David's gdb inferior calls patch

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index fdea1a3a631d..e654aa5eecd4 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2351,6 +2351,10 @@ pmac_suspend_devices(void)
                 return -EBUSY;
         }
 
+        /* Disable clock spreading on some machines */
+        pmac_tweak_clock_spreading(0);
+
+        /* Stop preemption */
         preempt_disable();
 
         /* Make sure the decrementer won't interrupt us */
@@ -2417,11 +2421,12 @@ pmac_wakeup_devices(void)
 
         /* Re-enable local CPU interrupts */
         local_irq_enable();
-
         mdelay(100);
-
         preempt_enable();
 
+        /* Re-enable clock spreading on some machines */
+        pmac_tweak_clock_spreading(1);
+
         /* Resume devices */
         device_resume();