aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/machine_kexec.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/s390/kernel/machine_kexec.c')
-rw-r--r--arch/s390/kernel/machine_kexec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
index 03d2027d656a..cdacf8f91b2d 100644
--- a/arch/s390/kernel/machine_kexec.c
+++ b/arch/s390/kernel/machine_kexec.c
@@ -80,8 +80,8 @@ static void __do_machine_kdump(void *image)
80#ifdef CONFIG_CRASH_DUMP 80#ifdef CONFIG_CRASH_DUMP
81 int (*start_kdump)(int) = (void *)((struct kimage *) image)->start; 81 int (*start_kdump)(int) = (void *)((struct kimage *) image)->start;
82 82
83 __load_psw_mask(PSW_MASK_BASE | PSW_DEFAULT_KEY | PSW_MASK_EA | PSW_MASK_BA);
84 setup_regs(); 83 setup_regs();
84 __load_psw_mask(PSW_MASK_BASE | PSW_DEFAULT_KEY | PSW_MASK_EA | PSW_MASK_BA);
85 start_kdump(1); 85 start_kdump(1);
86#endif 86#endif
87} 87}
@@ -214,6 +214,7 @@ static void __machine_kexec(void *data)
214{ 214{
215 struct kimage *image = data; 215 struct kimage *image = data;
216 216
217 __arch_local_irq_stosm(0x04); /* enable DAT */
217 pfault_fini(); 218 pfault_fini();
218 tracing_off(); 219 tracing_off();
219 debug_locks_off(); 220 debug_locks_off();