Skip to contentSkip to conversation

alpha: in_irq() cleanup

PATCH In review Changbin Du 2 participants 2 messages Aug 14, 2021 – Feb 26, 2023 Alpha port

lore
Share & tools
lore

Changbin Du

author
#0 lore raw

PATCH 1/1 alpha: in_irq() cleanup

Replace the obsolete and ambiguos macro in_irq() with new macro in_hardirq().

Signed-off-by Changbin Du <[email protected]>
---
 arch/alpha/kernel/process.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/alpha/kernel/process.c +1 -1
index a5123ea426ce..a524de9f1c98 100644
@@ -134,7 +134,7 @@ common_shutdown_1(void *generic_ptr)
 #ifdef CONFIG_DUMMY_CONSOLE
 		/* If we've gotten here after SysRq-b, leave interrupt
 		   context before taking over the console. */
-		if (in_irq())
+		if (in_hardirq())
 			irq_exit();
 		/* This has the effect of resetting the VGA video origin.  */
 		console_lock();
Signature · 1 line
2.30.2
maintainer
#1 lore raw
Quoted 23 lines · Changbin Du

Replace the obsolete and ambiguos macro in_irq() with new macro in_hardirq().

Signed-off-by Changbin Du <[email protected]>
---
 arch/alpha/kernel/process.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/alpha/kernel/process.c +1 -2
index a5123ea426ce..a524de9f1c98 100644
@@ -134,7 +134,7 @@ common_shutdown_1(void *generic_ptr)
 #ifdef CONFIG_DUMMY_CONSOLE
                /* If we've gotten here after SysRq-b, leave interrupt
                   context before taking over the console. */
-               if (in_irq())
+               if (in_hardirq())
                        irq_exit();
                /* This has the effect of resetting the VGA video origin.  */
                console_lock();
--
Quoted 2 lines

2.30.2

Thanks for the patch! This was included in my pull request today and is now upstream in Linus' tree.