Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b3c86a7 authored by Ivan Kokshaysky's avatar Ivan Kokshaysky Committed by Linus Torvalds
Browse files

[PATCH] alpha: fix kernel panic during SysRq-b 



acquire_console_sem() does BUG() in interrupt context now, as in the case
of SysRq-b.

Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 720b9429

arch/alpha/kernel/process.c

+4 −0
Original line number Diff line number Diff line
@@ -127,6 +127,10 @@ common_shutdown_1(void *generic_ptr) 
	/* If booted from SRM, reset some of the original environment. */

	if (alpha_using_srm) {

#ifdef CONFIG_DUMMY_CONSOLE

		/* If we've gotten here after SysRq-b, leave interrupt

		   context before taking over the console. */

		if (in_interrupt())

			irq_exit();

		/* This has the effect of resetting the VGA video origin.  */

		take_over_console(&dummy_con, 0, MAX_NR_CONSOLES-1, 1);

#endif