---

yaml --- r: 21459 b: refs/heads/master c: ab66a50 h: refs/heads/master i: 21457: c445fec 21455: d38a295 v: v3
git-mirror · Mar 20, 2006 · bed4163 · bed4163
1 parent e27b29a
commit bed4163
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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;