From 423b326a10ba92050df22056b5859ccd1a1907fe Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Sat, 14 Jan 2006 13:20:58 -0800 Subject: [PATCH] --- yaml --- r: 18503 b: refs/heads/master c: 68c119177890afff4759abda8da2b4ff5e06efa1 h: refs/heads/master i: 18501: 469a84e6b964ffd4e690423985ca33f02c0848fc 18499: a7c5af172baa4b018fcafe21324c51fe86ab3e20 18495: 2735ae9e8db0b41f89e732a4cc42399f08f48ce2 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/setup.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6ebe46ad56f0..743c87019e21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6410dd5e07b63606605794eeb7ec29e61fbda3db +refs/heads/master: 68c119177890afff4759abda8da2b4ff5e06efa1 diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c index b03847d100d9..c08325187a46 100644 --- a/trunk/arch/s390/kernel/setup.c +++ b/trunk/arch/s390/kernel/setup.c @@ -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); }