---

yaml --- r: 31302 b: refs/heads/master c: 24ac26d h: refs/heads/master v: v3
git-mirror · Jun 29, 2006 · 5474d16 · 5474d16
1 parent 80de9b0
commit 5474d16
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 946ea09962a56674fe564b41c3007933bb41a068
+refs/heads/master: 24ac26d425c96659b12cf16de7cbfe3bcbd73f05
diff --git a/trunk/arch/sparc64/kernel/irq.c b/trunk/arch/sparc64/kernel/irq.c
@@ -414,6 +414,10 @@ void irq_install_pre_handler(int virt_irq,
 	data->pre_handler_arg1 = arg1;
 	data->pre_handler_arg2 = arg2;
 
+	if (desc->chip == &sun4u_irq_ack ||
+	    desc->chip == &sun4v_irq_ack)
+		return;
+
 	desc->chip = (desc->chip == &sun4u_irq ?
 		      &sun4u_irq_ack : &sun4v_irq_ack);
 }