From: Paul Mackerras Date: Wed, 28 Sep 2005 10:29:44 +0000 (+1000) Subject: Don't call a NULL ack function in the generic IRQ code. X-Git-Tag: v2.6.15-rc1~59^2~239 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beeca08738c4c4024c81a591812bfe38f8c436c0;p=linux-2.6 Don't call a NULL ack function in the generic IRQ code. Some IRQ controllers don't need an ack function (e.g. OpenPIC on PPC platforms) and for them we'd rather not have the overhead of doing an indirect call to a function that does nothing. Signed-off-by: Paul Mackerras --- diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 3ff7b925c3..51df337b37 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c @@ -117,14 +117,16 @@ fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs) /* * No locking required for CPU-local interrupts: */ - desc->handler->ack(irq); + if (desc->handler->ack) + desc->handler->ack(irq); action_ret = handle_IRQ_event(irq, regs, desc->action); desc->handler->end(irq); return 1; } spin_lock(&desc->lock); - desc->handler->ack(irq); + if (desc->handler->ack) + desc->handler->ack(irq); /* * REPLAY is when Linux resends an IRQ that was dropped earlier * WAITING is used by probe to mark irqs that are being tested