[patch 34/47] Load disabled wait psw instead of stopping cpu on halt.

Martin Schwidefsky
2007-12-20T15:28:00Z

[-- Attachment #1: 133-disabled-wait.diff --]
[-- Type: text/plain, Size: 985 bytes --]

From: Michael Holzheu <holzheu@de.ibm.com>

Signed-off-by: Michael Holzheu <holzheu@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

arch/s390/kernel/ipl.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

Index: quilt-2.6/arch/s390/kernel/ipl.c
===================================================================
--- quilt-2.6.orig/arch/s390/kernel/ipl.c
+++ quilt-2.6/arch/s390/kernel/ipl.c
@@ -1087,8 +1087,12 @@ static struct shutdown_action vmcmd_acti

static void stop_run(struct shutdown_trigger *trigger)
{
- signal_processor(smp_processor_id(), sigp_stop_and_store_status);
- for (;;);
+ if (strcmp(trigger->name, ON_PANIC_STR) == 0)
+ disabled_wait((unsigned long) __builtin_return_address(0));
+ else {
+ signal_processor(smp_processor_id(), sigp_stop);
+ for (;;);
+ }
}

static struct shutdown_action stop_action = {SHUTDOWN_ACTION_STOP_STR,