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

torvalds · torvalds · commit 610192c229ce · 2025-12-21T14:34:13.000-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
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -1414,7 +1414,7 @@ setup_irq_thread(struct irqaction *new, unsigned int irq, bool secondary)`
`1414`	`1414`	`* Ensure the thread adjusts the affinity once it reaches the`
`1415`	`1415`	`* thread function.`
`1416`	`1416`	`*/`
`1417`		`- new->thread_flags = BIT(IRQTF_AFFINITY);`
	`1417`	`+ set_bit(IRQTF_AFFINITY, &new->thread_flags);`
`1418`	`1418`
`1419`	`1419`	`return 0;`
`1420`	`1420`	`}`