From 47ac29257139f7b47b317335f8e145801fbab8a6 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 26 Mar 2010 00:06:51 +0000 Subject: [PATCH] --- yaml --- r: 192209 b: refs/heads/master c: e58aa3d2d0cc01ad8d6f7f640a0670433f794922 h: refs/heads/master i: 192207: 2d6e1a450daaa89e5f3b4c9eb0bd3e6ed47a92ed v: v3 --- [refs] | 2 +- trunk/kernel/irq/handle.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 84f9f424e67a..f3190bce378a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae731f8d0785ccd3380f511bae888933b6562e45 +refs/heads/master: e58aa3d2d0cc01ad8d6f7f640a0670433f794922 diff --git a/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c index 76d5a671bfe1..27e5c6911223 100644 --- a/trunk/kernel/irq/handle.c +++ b/trunk/kernel/irq/handle.c @@ -370,9 +370,6 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action) irqreturn_t ret, retval = IRQ_NONE; unsigned int status = 0; - if (!(action->flags & IRQF_DISABLED)) - local_irq_enable_in_hardirq(); - do { trace_irq_handler_entry(irq, action); ret = action->handler(irq, action->dev_id);