Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1202eda authored by Michael Holzheu's avatar Michael Holzheu Committed by Martin Schwidefsky
Browse files

[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: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 798620fb

arch/s390/kernel/ipl.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -1618,7 +1618,8 @@ static struct shutdown_action vmcmd_action = {SHUTDOWN_ACTION_VMCMD_STR, 




static void stop_run(struct shutdown_trigger *trigger)

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));

		disabled_wait((unsigned long) __builtin_return_address(0));

	while (sigp(smp_processor_id(), sigp_stop) == sigp_busy)

	while (sigp(smp_processor_id(), sigp_stop) == sigp_busy)

		cpu_relax();

		cpu_relax();
@@ -1717,7 +1718,7 @@ static void do_panic(void) 
/* on restart */

/* on restart */





static struct shutdown_trigger on_restart_trigger = {ON_RESTART_STR,

static struct shutdown_trigger on_restart_trigger = {ON_RESTART_STR,

	&reipl_action};

	&stop_action};





static ssize_t on_restart_show(struct kobject *kobj,

static ssize_t on_restart_show(struct kobject *kobj,

			       struct kobj_attribute *attr, char *page)

			       struct kobj_attribute *attr, char *page)