diff options
| author | Michael Holzheu <holzheu@linux.vnet.ibm.com> | 2011-08-24 17:15:12 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-08-24 17:15:24 +0200 |
| commit | e1202edadbf846f0a4de70c8c0b9fe5a6c88b1cb (patch) | |
| tree | 3af4f58d2f11313f00d7a67ea6a99f947eebcfc2 /arch/s390 | |
| parent | 798620fb1dd510d163f1c875c8422dc605f446da (diff) | |
| download | linux-stable-e1202edadbf846f0a4de70c8c0b9fe5a6c88b1cb.tar.gz linux-stable-e1202edadbf846f0a4de70c8c0b9fe5a6c88b1cb.tar.bz2 linux-stable-e1202edadbf846f0a4de70c8c0b9fe5a6c88b1cb.zip | |
[S390] Change default action from reipl to stop for on_restart
The main purpose for PSW restart will be kdump. Therefore customers will
issue "system restart" for creating a dump. If kdump is not enabled,
currently "PSW restart" will reboot the system and then no dump can
be created any more. In order to still allow a manual stand-alone dump in
the case a user issues "PSW restart" on a system that has not enabled
kdump we now stop the system.
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/ipl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c index ee28e064ac3d..48c710206366 100644 --- a/arch/s390/kernel/ipl.c +++ b/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) |