2021-08-14 01:03:48

by Changbin Du

Subject: [PATCH] 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(-)

diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index a5123ea426ce..a524de9f1c98 100644
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -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();
--
2.30.2

2023-02-26 02:09:40

by Matt Turner

Subject: Re: [PATCH] alpha: in_irq() cleanup

On Fri, Aug 13, 2021 at 9:01 PM Changbin Du <[email protected]> wrote:
>
> 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(-)
>
> diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
> index a5123ea426ce..a524de9f1c98 100644
> --- a/arch/alpha/kernel/process.c
> +++ b/arch/alpha/kernel/process.c
> @@ -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();
> --
> 2.30.2
>

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