summaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/machine_kexec.c
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2006-12-04 15:40:40 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2006-12-04 15:40:40 +0100
commit29b08d2bae854f66d3cfd5f57aaf2e7c2c7fce32 (patch)
tree1a907c124f6a12ec4617a030e412a01be4c81b04 /arch/s390/kernel/machine_kexec.c
parent[S390] Cleanup memory_chunk array usage. (diff)
downloadlinux-29b08d2bae854f66d3cfd5f57aaf2e7c2c7fce32.tar.xz
linux-29b08d2bae854f66d3cfd5f57aaf2e7c2c7fce32.zip
[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.c8
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)
printk(KERN_INFO "kexec: machine_shutdown called\n");
}
-extern void pfault_fini(void);
-
void machine_kexec(struct kimage *image)
{
relocate_kernel_t data_mover;
- preempt_disable();
-#ifdef CONFIG_PFAULT
- if (MACHINE_IS_VM)
- pfault_fini();
-#endif
smp_send_stop();
+ pfault_fini();
s390_reset_system();
data_mover = (relocate_kernel_t) page_to_phys(image->control_code_page);