From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 8 May 2025 10:05:38 +0000 (+0200)
Subject: genirq/cpuhotplug: Fix up lock guards conversion brainf..t
X-Git-Tag: v6.16-rc1~189^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c855506257063f444044d0a85a2e9ad9ab1c7ecd;p=thirdparty%2Flinux.git

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>
---

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