From c376a2b48162d61efa9c7d97dc99a2743812ab76 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 10 May 2007 22:22:45 -0700
Subject: [PATCH] --- yaml --- r: 55903 b: refs/heads/master c:
 e1fa2e136ff64a3814a98c03d46320b9e80d29c8 h: refs/heads/master i:   55901:
 5f82ed3e4a3507daa9881d9a70340161fd6a34fd   55899:
 3d046b2610050f6a3f5cd6b00a9bf24451c1d4e7   55895:
 9ee3c5a12094b63f01766e0ecfd71aa30e62d032   55887:
 e0d494929a32ebbdbb988c3fd3759d8c7a10c342   55871:
 d1820412130ee5128bcdfb8b90e342853db7e35f v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/powerpc/kernel/irq.c               |  2 +-
 trunk/arch/powerpc/kernel/swsusp.c            |  4 ----
 trunk/arch/powerpc/platforms/cell/pervasive.c |  6 ++----
 trunk/include/asm-powerpc/hw_irq.h            | 11 +++++++++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 4bf9288c938b..735142647957 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2acdb1694494eb6f17b44b2b3065879af32d0d46
+refs/heads/master: e1fa2e136ff64a3814a98c03d46320b9e80d29c8
diff --git a/trunk/arch/powerpc/kernel/irq.c b/trunk/arch/powerpc/kernel/irq.c
index 9ed4931af164..068377a2a8dc 100644
--- a/trunk/arch/powerpc/kernel/irq.c
+++ b/trunk/arch/powerpc/kernel/irq.c
@@ -173,7 +173,7 @@ void local_irq_restore(unsigned long en)
 		lv1_get_version_info(&tmp);
 	}
 
-	hard_irq_enable();
+	__hard_irq_enable();
 }
 #endif /* CONFIG_PPC64 */
 
diff --git a/trunk/arch/powerpc/kernel/swsusp.c b/trunk/arch/powerpc/kernel/swsusp.c
index 064a7ba4f02c..77b7b34b5955 100644
--- a/trunk/arch/powerpc/kernel/swsusp.c
+++ b/trunk/arch/powerpc/kernel/swsusp.c
@@ -36,8 +36,4 @@ void restore_processor_state(void)
 #ifdef CONFIG_PPC32
 	set_context(current->active_mm->context.id, current->active_mm->pgd);
 #endif
-
-#ifdef CONFIG_PPC64
-	hard_irq_enable();
-#endif
 }
diff --git a/trunk/arch/powerpc/platforms/cell/pervasive.c b/trunk/arch/powerpc/platforms/cell/pervasive.c
index 8c20f0fb8651..812bf563ed65 100644
--- a/trunk/arch/powerpc/platforms/cell/pervasive.c
+++ b/trunk/arch/powerpc/platforms/cell/pervasive.c
@@ -43,12 +43,10 @@ static void cbe_power_save(void)
 	unsigned long ctrl, thread_switch_control;
 
 	/*
-	 * We need to hard disable interrupts, but we also need to mark them
-	 * hard disabled in the PACA so that the local_irq_enable() done by
-	 * our caller upon return propertly hard enables.
+	 * We need to hard disable interrupts, the local_irq_enable() done by
+	 * our caller upon return will hard re-enable.
 	 */
 	hard_irq_disable();
-	get_paca()->hard_enabled = 0;
 
 	ctrl = mfspr(SPRN_CTRLF);
 
diff --git a/trunk/include/asm-powerpc/hw_irq.h b/trunk/include/asm-powerpc/hw_irq.h
index 9e4dd98eb220..a7b60bf639e0 100644
--- a/trunk/include/asm-powerpc/hw_irq.h
+++ b/trunk/include/asm-powerpc/hw_irq.h
@@ -48,8 +48,15 @@ extern void iseries_handle_interrupts(void);
 
 #define irqs_disabled()		(local_get_flags() == 0)
 
-#define hard_irq_enable()	__mtmsrd(mfmsr() | MSR_EE, 1)
-#define hard_irq_disable()	__mtmsrd(mfmsr() & ~MSR_EE, 1)
+#define __hard_irq_enable()	__mtmsrd(mfmsr() | MSR_EE, 1)
+#define __hard_irq_disable()	__mtmsrd(mfmsr() & ~MSR_EE, 1)
+
+#define  hard_irq_disable()			\
+	do {					\
+		__hard_irq_disable();		\
+		get_paca()->soft_enabled = 0;	\
+		get_paca()->hard_enabled = 0;	\
+	} while(0)
 
 #else