---

yaml --- r: 54632 b: refs/heads/master c: f75d222 h: refs/heads/master v: v3
git-mirror · May 8, 2007 · 54e4665 · 54e4665
1 parent 8da34c2
commit 54e4665
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -317,17 +317,19 @@ 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;
 
 	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)