1 files changed, 6 insertions, 4 deletions

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 5597c157442a..203a518b6f14 100644
--- a/kernel/irq/manage.c
+++ b/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)