diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-25 20:25:06 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-29 14:48:03 +0200 |
| commit | 459960d831d14924eb4bcccadeb03ec81a1f524c (patch) | |
| tree | 21441eae0e25989df570a45c36e14d911fd208f9 /arch/ia64 | |
| parent | a2178334e9e7bb0fc11c9706114b43dbdd612ce4 (diff) | |
| download | linux-3.10-459960d831d14924eb4bcccadeb03ec81a1f524c.tar.gz linux-3.10-459960d831d14924eb4bcccadeb03ec81a1f524c.tar.bz2 linux-3.10-459960d831d14924eb4bcccadeb03ec81a1f524c.zip | |
ia64: iosapic: Remove redundant mask from ack()
The core code calls mask_ack() which calls irq_ack() and irq_mask()
for the case where an interrupt is disabled and marked pending. That
seems to be a leftover from the old __do_IRQ() mode.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/iosapic.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index 858a995f3d3..920983545ad 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c @@ -450,18 +450,9 @@ static void iosapic_ack_edge_irq (struct irq_data *data) { unsigned int irq = data->irq; - struct irq_desc *idesc = irq_desc + irq; irq_complete_move(irq); move_native_irq(irq); - /* - * Once we have recorded IRQ_PENDING already, we can mask the - * interrupt for real. This prevents IRQ storms from unhandled - * devices. - */ - if ((idesc->status & (IRQ_PENDING|IRQ_DISABLED)) == - (IRQ_PENDING|IRQ_DISABLED)) - mask_irq(data); } #define iosapic_enable_edge_irq unmask_irq |