From 5a3a1cb09fe49729860447444eed521f96fd098e Mon Sep 17 00:00:00 2001 From: Michael Holzheu Date: Sat, 26 Jan 2008 14:11:12 +0100 Subject: [PATCH] --- yaml --- r: 77207 b: refs/heads/master c: c654749777e8624187b53fbb94cea91a7bf74347 h: refs/heads/master i: 77205: fb9ce1d4e4f73d93bc88c8054620ef2c20ecca62 77203: 5aca3612ea8de7b22247f37a283ffa5585692685 77199: a938f51ca9b8d90e4ef865cb2436e04414e19da6 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/ipl.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8d28f13ae593..572ea7f7f71f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99ca4e582d4a4088969681efff97be44d98421a1 +refs/heads/master: c654749777e8624187b53fbb94cea91a7bf74347 diff --git a/trunk/arch/s390/kernel/ipl.c b/trunk/arch/s390/kernel/ipl.c index d73aff63725f..e3b9c6cc3aec 100644 --- a/trunk/arch/s390/kernel/ipl.c +++ b/trunk/arch/s390/kernel/ipl.c @@ -1096,8 +1096,12 @@ static struct shutdown_action vmcmd_action = {SHUTDOWN_ACTION_VMCMD_STR, 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,