提交 68c11917 编写于 作者: A Alexey Dobriyan 提交者: Linus Torvalds

[PATCH] s390: fix cpcmd calls on UP

Add missing fourth argument to cpcmd calls under !CONFIG_SMP.
Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 6410dd5e
...@@ -268,7 +268,7 @@ static void do_machine_restart_nonsmp(char * __unused) ...@@ -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) ...@@ -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);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册