1 files changed, 39 insertions, 0 deletions

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 85cf317c9069..5cd3db5cae41 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -629,6 +629,45 @@ void wakeup_decrementer(void)
         set_dec(ticks);
 }
 
+#ifdef CONFIG_SUSPEND
+void generic_suspend_disable_irqs(void)
+{
+        preempt_disable();
+
+        /* Disable the decrementer, so that it doesn't interfere
+         * with suspending.
+         */
+
+        set_dec(0x7fffffff);
+        local_irq_disable();
+        set_dec(0x7fffffff);
+}
+
+void generic_suspend_enable_irqs(void)
+{
+        wakeup_decrementer();
+
+        local_irq_enable();
+        preempt_enable();
+}
+
+/* Overrides the weak version in kernel/power/main.c */
+void arch_suspend_disable_irqs(void)
+{
+        if (ppc_md.suspend_disable_irqs)
+                ppc_md.suspend_disable_irqs();
+        generic_suspend_disable_irqs();
+}
+
+/* Overrides the weak version in kernel/power/main.c */
+void arch_suspend_enable_irqs(void)
+{
+        generic_suspend_enable_irqs();
+        if (ppc_md.suspend_enable_irqs)
+                ppc_md.suspend_enable_irqs();
+}
+#endif
+
 #ifdef CONFIG_SMP
 void __init smp_space_timers(unsigned int max_cpus)
 {