diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-25 15:25:06 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-29 08:48:03 -0400 |
commit | 459960d831d14924eb4bcccadeb03ec81a1f524c (patch) | |
tree | 21441eae0e25989df570a45c36e14d911fd208f9 /arch/ia64 | |
parent | a2178334e9e7bb0fc11c9706114b43dbdd612ce4 (diff) |
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 858a995f3d3b..920983545ad6 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c | |||
@@ -450,18 +450,9 @@ static void | |||
450 | iosapic_ack_edge_irq (struct irq_data *data) | 450 | iosapic_ack_edge_irq (struct irq_data *data) |
451 | { | 451 | { |
452 | unsigned int irq = data->irq; | 452 | unsigned int irq = data->irq; |
453 | struct irq_desc *idesc = irq_desc + irq; | ||
454 | 453 | ||
455 | irq_complete_move(irq); | 454 | irq_complete_move(irq); |
456 | move_native_irq(irq); | 455 | move_native_irq(irq); |
457 | /* | ||
458 | * Once we have recorded IRQ_PENDING already, we can mask the | ||
459 | * interrupt for real. This prevents IRQ storms from unhandled | ||
460 | * devices. | ||
461 | */ | ||
462 | if ((idesc->status & (IRQ_PENDING|IRQ_DISABLED)) == | ||
463 | (IRQ_PENDING|IRQ_DISABLED)) | ||
464 | mask_irq(data); | ||
465 | } | 456 | } |
466 | 457 | ||
467 | #define iosapic_enable_edge_irq unmask_irq | 458 | #define iosapic_enable_edge_irq unmask_irq |