diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index f6342ec084a..4f0cecb4f9e 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -733,4 +733,6 @@ void __init trap_init(void)
         pgm_check_table[0x15] = &operand_exception;
         pgm_check_table[0x1C] = &space_switch_exception;
         pgm_check_table[0x1D] = &hfp_sqrt_exception;
+	/* Enable machine checks early. */
+	local_mcck_enable();
 }