From 3efc8da29e519b5125135e512a6b47937aabb55e Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 25 Mar 2011 20:25:06 +0100 Subject: [PATCH] --- yaml --- r: 243313 b: refs/heads/master c: 459960d831d14924eb4bcccadeb03ec81a1f524c h: refs/heads/master i: 243311: d01e96fc1e85fd3f9617c43bf014b8bfa7596283 v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/iosapic.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 3ccb27fc6271..94dc2b46bc75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2178334e9e7bb0fc11c9706114b43dbdd612ce4 +refs/heads/master: 459960d831d14924eb4bcccadeb03ec81a1f524c diff --git a/trunk/arch/ia64/kernel/iosapic.c b/trunk/arch/ia64/kernel/iosapic.c index 858a995f3d3b..920983545ad6 100644 --- a/trunk/arch/ia64/kernel/iosapic.c +++ b/trunk/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