genirq/manage: Add buslock back in to enable_irq()

charleskeepax · KAGA-KOKO · commit ef3330b99c01 · 2025-10-24T11:38:39.000+02:00
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: bddd10c ("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
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -789,7 +789,7 @@ void __enable_irq(struct irq_desc *desc)`
`789`	`789`	`*/`
`790`	`790`	`void enable_irq(unsigned int irq)`
`791`	`791`	`{`
`792`		`- scoped_irqdesc_get_and_lock(irq, IRQ_GET_DESC_CHECK_GLOBAL) {`
	`792`	`+ scoped_irqdesc_get_and_buslock(irq, IRQ_GET_DESC_CHECK_GLOBAL) {`
`793`	`793`	`struct irq_desc *desc = scoped_irqdesc;`
`794`	`794`
`795`	`795`	`if (WARN(!desc->irq_data.chip, "enable_irq before setup/request_irq: irq %u\n", irq))`