From ce2c71bf284a404f6871224b6dc56e245c177c18 Mon Sep 17 00:00:00 2001
From: Takao Shinohara <shin@sm.sony.co.jp>
Date: Tue, 1 May 2007 07:01:07 +1000
Subject: [PATCH] --- yaml --- r: 55008 b: refs/heads/master c:
 0874dd40bf3c1f291da14b2c554c5640c0b6bf1b h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/arch/powerpc/kernel/irq.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c01491d089d3..f0bcd5d46e12 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc4f60c25ae71e8278dcf909486e4aa34de7eecb
+refs/heads/master: 0874dd40bf3c1f291da14b2c554c5640c0b6bf1b
diff --git a/trunk/arch/powerpc/kernel/irq.c b/trunk/arch/powerpc/kernel/irq.c
index 6c83fe229e60..5719a530f2d1 100644
--- a/trunk/arch/powerpc/kernel/irq.c
+++ b/trunk/arch/powerpc/kernel/irq.c
@@ -67,6 +67,7 @@
 #ifdef CONFIG_PPC64
 #include <asm/paca.h>
 #include <asm/firmware.h>
+#include <asm/lv1call.h>
 #endif
 
 int __irq_offset_value;
@@ -162,6 +163,16 @@ void local_irq_restore(unsigned long en)
 	local_paca->hard_enabled = en;
 	if ((int)mfspr(SPRN_DEC) < 0)
 		mtspr(SPRN_DEC, 1);
+
+	/*
+	 * Force the delivery of pending soft-disabled interrupts on PS3.
+	 * Any HV call will have this side effect.
+	 */
+	if (firmware_has_feature(FW_FEATURE_PS3_LV1)) {
+		u64 tmp;
+		lv1_get_version_info(&tmp);
+	}
+
 	hard_irq_enable();
 }
 #endif /* CONFIG_PPC64 */