From 09cdc4dc50067b6922792f51ae0c4ddcf3c16065 Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Thu, 29 Jun 2006 14:57:32 +0200 Subject: [PATCH] --- yaml --- r: 31112 b: refs/heads/master c: 06fa46a2fcb7e13386707a3eac74f11140a9f818 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/setup.c | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c43988e31f36..c0ceff3ab5a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4980082db1a8aa3ec45aa22cd4a10021955e22ed +refs/heads/master: 06fa46a2fcb7e13386707a3eac74f11140a9f818 diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c index b282034452a4..813444aac7d7 100644 --- a/trunk/arch/s390/kernel/setup.c +++ b/trunk/arch/s390/kernel/setup.c @@ -289,19 +289,34 @@ void (*_machine_power_off)(void) = do_machine_power_off_nonsmp; void machine_restart(char *command) { - console_unblank(); + if (!in_interrupt() || oops_in_progress) + /* + * Only unblank the console if we are called in enabled + * context or a bust_spinlocks cleared the way for us. + */ + console_unblank(); _machine_restart(command); } void machine_halt(void) { - console_unblank(); + if (!in_interrupt() || oops_in_progress) + /* + * Only unblank the console if we are called in enabled + * context or a bust_spinlocks cleared the way for us. + */ + console_unblank(); _machine_halt(); } void machine_power_off(void) { - console_unblank(); + if (!in_interrupt() || oops_in_progress) + /* + * Only unblank the console if we are called in enabled + * context or a bust_spinlocks cleared the way for us. + */ + console_unblank(); _machine_power_off(); }