Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68c11917 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

[PATCH] s390: fix cpcmd calls on UP 



Add missing fourth argument to cpcmd calls under !CONFIG_SMP.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6410dd5e

arch/s390/kernel/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static void do_machine_restart_nonsmp(char * __unused) 
	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(char * __unused) 
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);

}