mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
[PATCH] s390: fix cpcmd calls on UP
Add missing fourth argument to cpcmd calls under !CONFIG_SMP. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
6410dd5e07
commit
68c1191778
1 changed files with 3 additions and 3 deletions
|
@ -268,7 +268,7 @@ static void do_machine_restart_nonsmp(char * __unused)
|
||||||
reipl_diag();
|
reipl_diag();
|
||||||
|
|
||||||
if (MACHINE_IS_VM)
|
if (MACHINE_IS_VM)
|
||||||
cpcmd ("IPL", NULL, 0);
|
cpcmd ("IPL", NULL, 0, NULL);
|
||||||
else
|
else
|
||||||
reipl (0x10000 | S390_lowcore.ipl_device);
|
reipl (0x10000 | S390_lowcore.ipl_device);
|
||||||
}
|
}
|
||||||
|
@ -276,14 +276,14 @@ static void do_machine_restart_nonsmp(char * __unused)
|
||||||
static void do_machine_halt_nonsmp(void)
|
static void do_machine_halt_nonsmp(void)
|
||||||
{
|
{
|
||||||
if (MACHINE_IS_VM && strlen(vmhalt_cmd) > 0)
|
if (MACHINE_IS_VM && strlen(vmhalt_cmd) > 0)
|
||||||
cpcmd(vmhalt_cmd, NULL, 0);
|
cpcmd(vmhalt_cmd, NULL, 0, NULL);
|
||||||
signal_processor(smp_processor_id(), sigp_stop_and_store_status);
|
signal_processor(smp_processor_id(), sigp_stop_and_store_status);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void do_machine_power_off_nonsmp(void)
|
static void do_machine_power_off_nonsmp(void)
|
||||||
{
|
{
|
||||||
if (MACHINE_IS_VM && strlen(vmpoff_cmd) > 0)
|
if (MACHINE_IS_VM && strlen(vmpoff_cmd) > 0)
|
||||||
cpcmd(vmpoff_cmd, NULL, 0);
|
cpcmd(vmpoff_cmd, NULL, 0, NULL);
|
||||||
signal_processor(smp_processor_id(), sigp_stop_and_store_status);
|
signal_processor(smp_processor_id(), sigp_stop_and_store_status);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue