Merge tag 'irq-urgent-2025-12-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

610192c2 · Linus Torvalds <[email protected]> · 2025-12-21 14:34:13 -08:00

Pull irq fix from Ingo Molnar:
 "Fix IRQ thread affinity flags setup regression"

* tag 'irq-urgent-2025-12-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq: Don't overwrite interrupt thread flags on setup

Commit: 610192c229ce908dc7d04e2848751fcc3bbde273
Parents: 9094662f · fbbd7ce6

Merge commit. Changes below are compared with the first parent: 9094662f.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
kernel/irq/manage.c	modified	+1	−1	View file

kernel/irq/manage.c

View file

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 8b1b4c8..349ae79 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1414,7 +1414,7 @@ setup_irq_thread(struct irqaction *new, unsigned int irq, bool secondary)
 	 * Ensure the thread adjusts the affinity once it reaches the
 	 * thread function.
 	 */
-	new->thread_flags = BIT(IRQTF_AFFINITY);
+	set_bit(IRQTF_AFFINITY, &new->thread_flags);
 
 	return 0;
 }