From 48d722e9b2158ba7a8e1181d133cf6450a6fc280 Mon Sep 17 00:00:00 2001 From: Michael Holzheu Date: Wed, 24 Aug 2011 17:15:12 +0200 Subject: [PATCH] --- yaml --- r: 263387 b: refs/heads/master c: e1202edadbf846f0a4de70c8c0b9fe5a6c88b1cb h: refs/heads/master i: 263385: 94fee092e0db5fa5e2e7afe77d626b1c35a083e7 263383: ce30c41c47bc8c8baeabc165c13ffee55c3e56b3 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/ipl.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b4ffe9ca38e9..eed17ec47504 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 798620fb1dd510d163f1c875c8422dc605f446da +refs/heads/master: e1202edadbf846f0a4de70c8c0b9fe5a6c88b1cb diff --git a/trunk/arch/s390/kernel/ipl.c b/trunk/arch/s390/kernel/ipl.c index ee28e064ac3d..48c710206366 100644 --- a/trunk/arch/s390/kernel/ipl.c +++ b/trunk/arch/s390/kernel/ipl.c @@ -1618,7 +1618,8 @@ static struct shutdown_action vmcmd_action = {SHUTDOWN_ACTION_VMCMD_STR, static void stop_run(struct shutdown_trigger *trigger) { - if (strcmp(trigger->name, ON_PANIC_STR) == 0) + if (strcmp(trigger->name, ON_PANIC_STR) == 0 || + strcmp(trigger->name, ON_RESTART_STR) == 0) disabled_wait((unsigned long) __builtin_return_address(0)); while (sigp(smp_processor_id(), sigp_stop) == sigp_busy) cpu_relax(); @@ -1717,7 +1718,7 @@ static void do_panic(void) /* on restart */ static struct shutdown_trigger on_restart_trigger = {ON_RESTART_STR, - &reipl_action}; + &stop_action}; static ssize_t on_restart_show(struct kobject *kobj, struct kobj_attribute *attr, char *page)