android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] s390: fix cpcmd calls on UP

Browse Source 
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:
Alexey Dobriyan
2006-01-14 13:20:58 -08:00
committed by Linus Torvalds
parent 6410dd5e07
commit 68c1191778
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/s390/kernel/setup.c
View File

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