Messages in this thread Patch in this message | | | Date | Thu, 12 Jan 2006 18:16:42 +0100 | From | Martin Schwidefsky <> | Subject | [patch 7/13] s390: fix cpcmd calls on UP. |
| |
From: Alexey Dobriyan <adobriyan@gmail.com>
[patch 7/13] 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>
---
arch/s390/kernel/setup.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff -urpN linux-2.6/arch/s390/kernel/setup.c linux-2.6-patched/arch/s390/kernel/setup.c --- linux-2.6/arch/s390/kernel/setup.c 2006-01-12 15:43:19.000000000 +0100 +++ linux-2.6-patched/arch/s390/kernel/setup.c 2006-01-12 15:43:57.000000000 +0100 @@ -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); } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |