From 54e4665c001a6353fc58a63c7bdbc738af14d8d0 Mon Sep 17 00:00:00 2001 From: "Ahmed S. Darwish" Date: Tue, 8 May 2007 00:27:55 -0700 Subject: [PATCH] --- yaml --- r: 54632 b: refs/heads/master c: f75d222b836f7febfab0954c7612b23059d748cb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/irq/manage.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index eefd76b3b602..594785a57d4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3367b994fe4f131ab1240600682a1981de7cad0c +refs/heads/master: f75d222b836f7febfab0954c7612b23059d748cb diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c index 5597c157442a..203a518b6f14 100644 --- a/trunk/kernel/irq/manage.c +++ b/trunk/kernel/irq/manage.c @@ -317,10 +317,7 @@ int setup_irq(unsigned int irq, struct irqaction *new) } *p = new; -#if defined(CONFIG_IRQ_PER_CPU) - if (new->flags & IRQF_PERCPU) - desc->status |= IRQ_PER_CPU; -#endif + /* Exclude IRQ from balancing */ if (new->flags & IRQF_NOBALANCING) desc->status |= IRQ_NO_BALANCING; @@ -328,6 +325,11 @@ int setup_irq(unsigned int irq, struct irqaction *new) if (!shared) { irq_chip_set_defaults(desc->chip); +#if defined(CONFIG_IRQ_PER_CPU) + if (new->flags & IRQF_PERCPU) + desc->status |= IRQ_PER_CPU; +#endif + /* Setup the type (level, edge polarity) if configured: */ if (new->flags & IRQF_TRIGGER_MASK) { if (desc->chip && desc->chip->set_type)