From bed41634ee9c2b1bd4d43c8d9ced28dead167ccc Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Wed, 15 Feb 2006 01:18:19 -0800
Subject: [PATCH] --- yaml --- r: 21459 b: refs/heads/master c:
 ab66a50e31deb48b0444c248e67e5aa3217efda5 h: refs/heads/master i:   21457:
 c445fec80cb3d2f02ee15f3d5d8ac952bf33cad1   21455:
 d38a295bd7f335dcce7d8d9283387e8b8687b40e v: v3

---
 [refs]                          |  2 +-
 trunk/arch/sparc64/kernel/irq.c | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 81465b914a63..5ea210e53a35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c3514e4501565d76f9e4dec43e1fc17389f4811
+refs/heads/master: ab66a50e31deb48b0444c248e67e5aa3217efda5
diff --git a/trunk/arch/sparc64/kernel/irq.c b/trunk/arch/sparc64/kernel/irq.c
index c786d2549bce..4d9931d124ab 100644
--- a/trunk/arch/sparc64/kernel/irq.c
+++ b/trunk/arch/sparc64/kernel/irq.c
@@ -164,6 +164,10 @@ void enable_irq(unsigned int irq)
 		if (err != HV_EOK)
 			printk("sun4v_intr_setenabled(%x): err(%d)\n",
 			       ino, err);
+		err = sun4v_intr_setstate(ino, HV_INTR_STATE_IDLE);
+		if (err != HV_EOK)
+			printk("sun4v_intr_setstate(%x): "
+			       "err(%d)\n", ino, err);
 	} else {
 		if (tlb_type == cheetah || tlb_type == cheetah_plus) {
 			unsigned long ver;
@@ -663,10 +667,11 @@ static void process_bucket(int irq, struct ino_bucket *bp, struct pt_regs *regs)
 				       "err(%d)\n", ino, err);
 		} else {
 			upa_writel(ICLR_IDLE, bp->iclr);
-			/* Test and add entropy */
-			if (random & SA_SAMPLE_RANDOM)
-				add_interrupt_randomness(irq);
 		}
+
+		/* Test and add entropy */
+		if (random & SA_SAMPLE_RANDOM)
+			add_interrupt_randomness(irq);
 	}
 out:
 	bp->flags &= ~IBF_INPROGRESS;