diff options
Diffstat (limited to 'kernel/irq/migration.c')
-rw-r--r-- | kernel/irq/migration.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c index 6f2f98480354..9485ae081dcd 100644 --- a/kernel/irq/migration.c +++ b/kernel/irq/migration.c | |||
@@ -9,7 +9,7 @@ void move_masked_irq(int irq) | |||
9 | struct irq_desc *desc = irq_to_desc(irq); | 9 | struct irq_desc *desc = irq_to_desc(irq); |
10 | struct irq_chip *chip = desc->irq_data.chip; | 10 | struct irq_chip *chip = desc->irq_data.chip; |
11 | 11 | ||
12 | if (likely(!(desc->status & IRQ_MOVE_PENDING))) | 12 | if (likely(!irqd_is_setaffinity_pending(&desc->irq_data))) |
13 | return; | 13 | return; |
14 | 14 | ||
15 | /* | 15 | /* |
@@ -20,7 +20,7 @@ void move_masked_irq(int irq) | |||
20 | return; | 20 | return; |
21 | } | 21 | } |
22 | 22 | ||
23 | desc->status &= ~IRQ_MOVE_PENDING; | 23 | irqd_clr_move_pending(&desc->irq_data); |
24 | 24 | ||
25 | if (unlikely(cpumask_empty(desc->pending_mask))) | 25 | if (unlikely(cpumask_empty(desc->pending_mask))) |
26 | return; | 26 | return; |
@@ -58,7 +58,7 @@ void move_native_irq(int irq) | |||
58 | struct irq_desc *desc = irq_to_desc(irq); | 58 | struct irq_desc *desc = irq_to_desc(irq); |
59 | bool masked; | 59 | bool masked; |
60 | 60 | ||
61 | if (likely(!(desc->status & IRQ_MOVE_PENDING))) | 61 | if (likely(!irqd_is_setaffinity_pending(&desc->irq_data))) |
62 | return; | 62 | return; |
63 | 63 | ||
64 | if (unlikely(desc->istate & IRQS_DISABLED)) | 64 | if (unlikely(desc->istate & IRQS_DISABLED)) |