---

yaml
---
r: 263387
b: refs/heads/master
c: e1202ed
h: refs/heads/master
i:
  263385: 94fee09
  263383: ce30c41
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 798620fb1dd510d163f1c875c8422dc605f446da
+refs/heads/master: e1202edadbf846f0a4de70c8c0b9fe5a6c88b1cb

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)