summaryrefslogtreecommitdiffstats
path: root/arch/alpha
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2020-12-15 20:42:29 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-12-15 22:46:15 -0800
commit4083a281e310dc4ff7214d9da6264949b85f20c4 (patch)
treed6e425431047032f250fb4ccac16cc2b23f552ae /arch/alpha
parent7c33023aad164b9fb8a2291d2674935871ee06f3 (diff)
downloadlinux-4083a281e310dc4ff7214d9da6264949b85f20c4.tar.gz
linux-4083a281e310dc4ff7214d9da6264949b85f20c4.tar.bz2
linux-4083a281e310dc4ff7214d9da6264949b85f20c4.zip
alpha: replace bogus in_interrupt()
in_interrupt() is true for a variety of things including bottom half disabled regions. Deducing hard interrupt context from it is dubious at best. Use in_irq() which is true if called in hard interrupt context. Otherwise calling irq_exit() would do more harm than good. Link: https://lkml.kernel.org/r/20201113135832.2202833-1-bigeasy@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Tested-by: Serge Belyshev <belyshev@depni.sinp.msu.ru> Cc: Richard Henderson <rth@twiddle.net> Cc: Matt Turner <mattst88@gmail.com> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/alpha')
-rw-r--r--arch/alpha/kernel/process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index 4c7b0414a3ff..6c71554206cc 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_interrupt())
+ if (in_irq())
irq_exit();
/* This has the effect of resetting the VGA video origin. */
console_lock();