From: Alexey Dobriyan Add missing fourth argument to cpcmd calls under !CONFIG_SMP. Signed-off-by: Alexey Dobriyan Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton --- arch/s390/kernel/setup.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff -puN arch/s390/kernel/setup.c~s390-fix-cpcmd-calls-on-up arch/s390/kernel/setup.c --- 25/arch/s390/kernel/setup.c~s390-fix-cpcmd-calls-on-up Thu Jan 12 17:02:32 2006 +++ 25-akpm/arch/s390/kernel/setup.c Thu Jan 12 17:02:32 2006 @@ -268,7 +268,7 @@ static void do_machine_restart_nonsmp(ch reipl_diag(); if (MACHINE_IS_VM) - cpcmd ("IPL", NULL, 0); + cpcmd ("IPL", NULL, 0, NULL); else reipl (0x10000 | S390_lowcore.ipl_device); } @@ -276,14 +276,14 @@ static void do_machine_restart_nonsmp(ch static void do_machine_halt_nonsmp(void) { 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); } static void do_machine_power_off_nonsmp(void) { 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); } _