---

yaml --- r: 9226 b: refs/heads/master c: 4b3c86a h: refs/heads/master v: v3
git-mirror · Sep 23, 2005 · 61ecd5a · 61ecd5a
1 parent d4241ac
commit 61ecd5a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 720b9429e8f41f7c4ee9df293403650905042035
+refs/heads/master: 4b3c86a7452df8608c32a1c1f19c0cc0723c145f
diff --git a/trunk/arch/alpha/kernel/process.c b/trunk/arch/alpha/kernel/process.c
@@ -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