]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
genirq/manage: Add buslock back in to enable_irq()
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Thu, 23 Oct 2025 15:49:01 +0000 (16:49 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 2 Nov 2025 13:18:03 +0000 (22:18 +0900)
[ Upstream commit ef3330b99c01bda53f2a189b58bed8f6b7397f28 ]

The locking was changed from a buslock to a plain lock, but the patch
description states there was no functional change. Assuming this was
accidental so reverting to using the buslock.

Fixes: bddd10c55407 ("genirq/manage: Rework enable_irq()")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://patch.msgid.link/20251023154901.1333755-4-ckeepax@opensource.cirrus.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/irq/manage.c

index 7d68fb5dc2428303337fe5e31d108708ccdc3e9f..400856abf672199a42299652b182d920b457a5a1 100644 (file)
@@ -789,7 +789,7 @@ void __enable_irq(struct irq_desc *desc)
  */
 void enable_irq(unsigned int irq)
 {
-       scoped_irqdesc_get_and_lock(irq, IRQ_GET_DESC_CHECK_GLOBAL) {
+       scoped_irqdesc_get_and_buslock(irq, IRQ_GET_DESC_CHECK_GLOBAL) {
                struct irq_desc *desc = scoped_irqdesc;
 
                if (WARN(!desc->irq_data.chip, "enable_irq before setup/request_irq: irq %u\n", irq))