Browse Source

[SPARC64]: bp->pil can never be zero

Only pil0_dummy_bucket had a pil of zero and we just killed that
off, so we can delete all special case code that used bp->pil==0
as a way to identify a dummy bucket.

Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller 19 years ago
parent
commit
6a76267f0e
1 changed files with 13 additions and 14 deletions
  1. 13 14
      arch/sparc64/kernel/irq.c

+ 13 - 14
arch/sparc64/kernel/irq.c

@@ -633,23 +633,22 @@ static void process_bucket(struct ino_bucket *bp, struct pt_regs *regs)
 		if (!action_mask)
 			break;
 	}
-	if (bp->pil != 0) {
-		if (tlb_type == hypervisor) {
-			unsigned int ino = __irq_ino(bp);
-			int 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 {
-			upa_writel(ICLR_IDLE, bp->iclr);
-		}
+	if (tlb_type == hypervisor) {
+		unsigned int ino = __irq_ino(bp);
+		int err;
 
-		/* Test and add entropy */
-		if (random & SA_SAMPLE_RANDOM)
-			add_interrupt_randomness(bp->pil);
+		err = sun4v_intr_setstate(ino, HV_INTR_STATE_IDLE);
+		if (err != HV_EOK)
+			printk("sun4v_intr_setstate(%x): "
+			       "err(%d)\n", ino, err);
+	} else {
+		upa_writel(ICLR_IDLE, bp->iclr);
 	}
+
+	/* Test and add entropy */
+	if (random & SA_SAMPLE_RANDOM)
+		add_interrupt_randomness(bp->pil);
 out:
 	bp->flags &= ~IBF_INPROGRESS;
 }