Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 18503
b: refs/heads/master
c: 68c1191
h: refs/heads/master
i:
  18501: 469a84e
  18499: a7c5af1
  18495: 2735ae9
v: v3
  • Loading branch information
Alexey Dobriyan authored and Linus Torvalds committed Jan 15, 2006
1 parent c529fa1 commit 423b326
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6410dd5e07b63606605794eeb7ec29e61fbda3db
refs/heads/master: 68c119177890afff4759abda8da2b4ff5e06efa1
6 changes: 3 additions & 3 deletions trunk/arch/s390/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -268,22 +268,22 @@ 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);
}

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

Expand Down

0 comments on commit 423b326

Please sign in to comment.