2 files changed, 3 insertions, 3 deletions

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 056aa49698b4..f1cfa271ba70 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -73,8 +73,8 @@ int irq_can_set_affinity(unsigned int irq)
 {
         struct irq_desc *desc = irq_to_desc(irq);
 
-        if (CHECK_IRQ_PER_CPU(desc->status) || !desc->irq_data.chip ||
-            !desc->irq_data.chip->irq_set_affinity)
+        if ((desc->status & (IRQ_PER_CPU | IRQ_NO_BALANCING)) ||
+            !desc->irq_data.chip || !desc->irq_data.chip->irq_set_affinity)
                 return 0;
 
         return 1;
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 9485ae081dcd..24f53caddf47 100644
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -15,7 +15,7 @@ void move_masked_irq(int irq)
         /*
          * Paranoia: cpu-local interrupts shouldn't be calling in here anyway.
          */
-        if (CHECK_IRQ_PER_CPU(desc->status)) {
+        if (desc->status & (IRQ_PER_CPU | IRQ_NO_BALANCING)) {
                 WARN_ON(1);
                 return;
         }