diff --git a/[refs] b/[refs]
index 21839a34f245..e187455348c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf1ab978be2318c5a564de9aa0f1a217b44170d4
+refs/heads/master: 5850dd8f6d4e79484d498c0d77b223d1041f9954
diff --git a/trunk/arch/powerpc/platforms/cell/pervasive.c b/trunk/arch/powerpc/platforms/cell/pervasive.c
index c68fabdc7874..8c20f0fb8651 100644
--- a/trunk/arch/powerpc/platforms/cell/pervasive.c
+++ b/trunk/arch/powerpc/platforms/cell/pervasive.c
@@ -41,6 +41,15 @@
 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.
+	 */
+	hard_irq_disable();
+	get_paca()->hard_enabled = 0;
+
 	ctrl = mfspr(SPRN_CTRLF);
 
 	/* Enable DEC and EE interrupt request */