summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2006-06-29 14:38:21 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-29 16:37:27 -0700
commit24ac26d425c96659b12cf16de7cbfe3bcbd73f05 (patch)
tree6e2cbfad38d3f167dfa5b53b75f9e0ba1fb3ae83 /arch
parent946ea09962a56674fe564b41c3007933bb41a068 (diff)
downloadlinux-24ac26d425c96659b12cf16de7cbfe3bcbd73f05.tar.gz
linux-24ac26d425c96659b12cf16de7cbfe3bcbd73f05.tar.bz2
linux-24ac26d425c96659b12cf16de7cbfe3bcbd73f05.zip
[SPARC64]: Let irq_install_pre_handler() get called multiple times.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc64/kernel/irq.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index ab9e640df228..eebe02f3f4cb 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/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);
}