diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 01:03:21 +0200 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 01:03:21 +0200 |
commit | 536f8098026bde1368bbfcbcb9682a7637b73df2 (patch) | |
tree | cf83d2e1afa503b6aeba103b55cd1da0af4e7a4c /arch/s390/kernel/smp.c | |
parent | [PATCH] Add NVIDIA device ID in sata_nv (diff) | |
parent | [PATCH] ppc32: Fix configuration of PCI IO space on MPC85xx platform (diff) | |
download | linux-536f8098026bde1368bbfcbcb9682a7637b73df2.tar.xz linux-536f8098026bde1368bbfcbcb9682a7637b73df2.zip |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/s390/kernel/smp.c')
-rw-r--r-- | arch/s390/kernel/smp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index 85222fee4361..e13c87b446b2 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c @@ -65,6 +65,7 @@ extern char vmhalt_cmd[]; extern char vmpoff_cmd[]; extern void reipl(unsigned long devno); +extern void reipl_diag(void); static void smp_ext_bitcall(int, ec_bit_sig); static void smp_ext_bitcall_others(ec_bit_sig); @@ -283,6 +284,8 @@ static void do_machine_restart(void * __unused) * interrupted by an external interrupt and s390irq * locks are always held disabled). */ + reipl_diag(); + if (MACHINE_IS_VM) cpcmd ("IPL", NULL, 0, NULL); else |