genirq/cpuhotplug: Fix up lock guards conversion brainf..t

KAGA-KOKO · KAGA-KOKO · commit c85550625706 · 2025-05-08T12:05:38.000+02:00
The lock guard conversion converted raw_spin_lock_irq() to scoped_guard(raw_spinlock), which is obviously bogus and makes lockdep mightily unhappy. Note to self: Copy and pasta without using brain is a patently bad idea. Fixes: 88a4df1 ("genirq/cpuhotplug: Convert to lock guards") Reported-by: Borislav Petkov <bp@alien8.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: Borislav Petkov <bp@alien8.de>
diff --git a/kernel/irq/cpuhotplug.c b/kernel/irq/cpuhotplug.c
@@ -243,7 +243,7 @@ int irq_affinity_online_cpu(unsigned int cpu)
 	irq_lock_sparse();
 	for_each_active_irq(irq) {
 		desc = irq_to_desc(irq);
-		scoped_guard(raw_spinlock, &desc->lock)
+		scoped_guard(raw_spinlock_irq, &desc->lock)
 			irq_restore_affinity_of_irq(desc, cpu);
 	}
 	irq_unlock_sparse();

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ int irq_affinity_online_cpu(unsigned int cpu)`
`243`	`243`	`irq_lock_sparse();`
`244`	`244`	`for_each_active_irq(irq) {`
`245`	`245`	`desc = irq_to_desc(irq);`
`246`		`- scoped_guard(raw_spinlock, &desc->lock)`
	`246`	`+ scoped_guard(raw_spinlock_irq, &desc->lock)`
`247`	`247`	`irq_restore_affinity_of_irq(desc, cpu);`
`248`	`248`	`}`
`249`	`249`	`irq_unlock_sparse();`