diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-11 00:07:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-11 00:07:03 -0400 |
| commit | cd04b947bc674f8fc9cac38ec30497bae5d664ad (patch) | |
| tree | 988b0b7ea08063e5499672346eb2f619f0629717 /arch/s390/kernel/machine_kexec.c | |
| parent | b3df9f813bc7b9db62ae0c90b8990b1cebf97345 (diff) | |
| parent | bc68552faad0e134eb22281343d5ae5a4873fa80 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/s390/kernel/machine_kexec.c')
| -rw-r--r-- | arch/s390/kernel/machine_kexec.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c index 2721c3a32b8..5aa71b05b8a 100644 --- a/arch/s390/kernel/machine_kexec.c +++ b/arch/s390/kernel/machine_kexec.c @@ -70,6 +70,8 @@ machine_kexec(struct kimage *image) for (;;); } +extern void pfault_fini(void); + static void kexec_halt_all_cpus(void *kernel_image) { @@ -78,6 +80,11 @@ kexec_halt_all_cpus(void *kernel_image) struct kimage *image; relocate_kernel_t data_mover; +#ifdef CONFIG_PFAULT + if (MACHINE_IS_VM) + pfault_fini(); +#endif + if (atomic_compare_and_swap(-1, smp_processor_id(), &cpuid)) signal_processor(smp_processor_id(), sigp_stop); |