[tip: irq/core] genirq/cpuhotplug: Fix up lock guards conversion brainf..t

tip-bot2 for Thomas Gleixner posted 1 patch 7 months, 1 week ago
kernel/irq/cpuhotplug.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[tip: irq/core] genirq/cpuhotplug: Fix up lock guards conversion brainf..t
Posted by tip-bot2 for Thomas Gleixner 7 months, 1 week ago
The following commit has been merged into the irq/core branch of tip:

Commit-ID:     c855506257063f444044d0a85a2e9ad9ab1c7ecd
Gitweb:        https://git.kernel.org/tip/c855506257063f444044d0a85a2e9ad9ab1c7ecd
Author:        Thomas Gleixner <tglx@linutronix.de>
AuthorDate:    Thu, 08 May 2025 12:05:38 +02:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 08 May 2025 12:05:38 +02:00

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

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: 88a4df117ad6 ("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>
---
 kernel/irq/cpuhotplug.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/irq/cpuhotplug.c b/kernel/irq/cpuhotplug.c
index 7bd4c2a..e77ca6d 100644
--- 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();