1 files changed, 3 insertions, 1 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 4687457fe7f0..2b0f9192a830 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -712,11 +712,13 @@ void irq_modify_status(unsigned int irq, unsigned long clr, unsigned long set)
         irq_settings_clr_and_set(desc, clr, set);
 
         irqd_clear(&desc->irq_data, IRQD_NO_BALANCING | IRQD_PER_CPU |
-                   IRQD_TRIGGER_MASK | IRQD_LEVEL);
+                   IRQD_TRIGGER_MASK | IRQD_LEVEL | IRQD_MOVE_PCNTXT);
         if (irq_settings_has_no_balance_set(desc))
                 irqd_set(&desc->irq_data, IRQD_NO_BALANCING);
         if (irq_settings_is_per_cpu(desc))
                 irqd_set(&desc->irq_data, IRQD_PER_CPU);
+        if (irq_settings_can_move_pcntxt(desc))
+                irqd_set(&desc->irq_data, IRQD_MOVE_PCNTXT);
 
         irqd_set(&desc->irq_data, irq_settings_get_trigger_mask(desc));