aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/handle.c
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2009-04-27 20:58:23 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-28 06:21:15 -0400
commitfcef5911c7ea89b80d5bfc727f402f37c9eefd57 (patch)
treee37ad2cda662933b01b2ba6e28e570a18ef1edc2 /kernel/irq/handle.c
parent9ec4fa271faf2db3b8e1419c998da1ca6b094eb6 (diff)
x86/irq: remove leftover code from NUMA_MIGRATE_IRQ_DESC
The original feature of migrating irq_desc dynamic was too fragile and was causing problems: it caused crashes on systems with lots of cards with MSI-X when user-space irq-balancer was enabled. We now have new patches that create irq_desc according to device numa node. This patch removes the leftover bits of the dynamic balancer. [ Impact: remove dead code ] Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Suresh Siddha <suresh.b.siddha@intel.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Rusty Russell <rusty@rustcorp.com.au> LKML-Reference: <49F654AF.8000808@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/irq/handle.c')
-rw-r--r--kernel/irq/handle.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 882c79800107..3e0cbc44bd73 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -458,11 +458,8 @@ unsigned int __do_IRQ(unsigned int irq)
458 /* 458 /*
459 * No locking required for CPU-local interrupts: 459 * No locking required for CPU-local interrupts:
460 */ 460 */
461 if (desc->chip->ack) { 461 if (desc->chip->ack)
462 desc->chip->ack(irq); 462 desc->chip->ack(irq);
463 /* get new one */
464 desc = irq_remap_to_desc(irq, desc);
465 }
466 if (likely(!(desc->status & IRQ_DISABLED))) { 463 if (likely(!(desc->status & IRQ_DISABLED))) {
467 action_ret = handle_IRQ_event(irq, desc->action); 464 action_ret = handle_IRQ_event(irq, desc->action);
468 if (!noirqdebug) 465 if (!noirqdebug)
@@ -473,10 +470,8 @@ unsigned int __do_IRQ(unsigned int irq)
473 } 470 }
474 471
475 spin_lock(&desc->lock); 472 spin_lock(&desc->lock);
476 if (desc->chip->ack) { 473 if (desc->chip->ack)
477 desc->chip->ack(irq); 474 desc->chip->ack(irq);
478 desc = irq_remap_to_desc(irq, desc);
479 }
480 /* 475 /*
481 * REPLAY is when Linux resends an IRQ that was dropped earlier 476 * REPLAY is when Linux resends an IRQ that was dropped earlier
482 * WAITING is used by probe to mark irqs that are being tested 477 * WAITING is used by probe to mark irqs that are being tested