diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2006-12-04 09:40:40 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-12-04 09:40:40 -0500 |
commit | 29b08d2bae854f66d3cfd5f57aaf2e7c2c7fce32 (patch) | |
tree | 1a907c124f6a12ec4617a030e412a01be4c81b04 /arch/s390/kernel/machine_kexec.c | |
parent | 36a2bd425d9b3ba2a40b0653e08d17702c78558e (diff) |
[S390] pfault code cleanup.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/machine_kexec.c')
-rw-r--r-- | arch/s390/kernel/machine_kexec.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c index def5caf8f72f..f6d9bcc0f75b 100644 --- a/arch/s390/kernel/machine_kexec.c +++ b/arch/s390/kernel/machine_kexec.c | |||
@@ -49,18 +49,12 @@ void machine_shutdown(void) | |||
49 | printk(KERN_INFO "kexec: machine_shutdown called\n"); | 49 | printk(KERN_INFO "kexec: machine_shutdown called\n"); |
50 | } | 50 | } |
51 | 51 | ||
52 | extern void pfault_fini(void); | ||
53 | |||
54 | void machine_kexec(struct kimage *image) | 52 | void machine_kexec(struct kimage *image) |
55 | { | 53 | { |
56 | relocate_kernel_t data_mover; | 54 | relocate_kernel_t data_mover; |
57 | 55 | ||
58 | preempt_disable(); | ||
59 | #ifdef CONFIG_PFAULT | ||
60 | if (MACHINE_IS_VM) | ||
61 | pfault_fini(); | ||
62 | #endif | ||
63 | smp_send_stop(); | 56 | smp_send_stop(); |
57 | pfault_fini(); | ||
64 | s390_reset_system(); | 58 | s390_reset_system(); |
65 | 59 | ||
66 | data_mover = (relocate_kernel_t) page_to_phys(image->control_code_page); | 60 | data_mover = (relocate_kernel_t) page_to_phys(image->control_code_page); |