diff options
author | Huacai Chen <chenhuacai@loongson.cn> | 2025-01-25 18:15:32 +0800 |
---|---|---|
committer | Huacai Chen <chenhuacai@loongson.cn> | 2025-01-25 18:15:32 +0800 |
commit | 09e9d370ceb304418b47fd1fda901f00c7f450a0 (patch) | |
tree | 0da22c569167a2069b0851d88c6eb47ed97497b0 /kernel/irq/chip.c | |
parent | ffd294d346d185b70e28b1a28abe367bbfe53c04 (diff) | |
parent | a4b3990e01df169334ff2695d2fe494eda63a297 (diff) |
Merge tag 'irq-core-2025-01-21' into loongarch-next
LoongArch architecture changes for 6.14 depend on the irq-core changes
(AVECINTC fixes) to work well for NUMA, so merge them to create a base.
Diffstat (limited to 'kernel/irq/chip.c')
-rw-r--r-- | kernel/irq/chip.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 271e9139de77..c901436ebd9f 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -1114,13 +1114,11 @@ void irq_modify_status(unsigned int irq, unsigned long clr, unsigned long set) trigger = irqd_get_trigger_type(&desc->irq_data); irqd_clear(&desc->irq_data, IRQD_NO_BALANCING | IRQD_PER_CPU | - IRQD_TRIGGER_MASK | IRQD_LEVEL | IRQD_MOVE_PCNTXT); + IRQD_TRIGGER_MASK | IRQD_LEVEL); 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); if (irq_settings_is_level(desc)) irqd_set(&desc->irq_data, IRQD_LEVEL); |