diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 8d15314381e04640bbf227ff045b9d9a782f22cf..cae14c499511c6f5358170906764a95045ed4b39 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -208,6 +208,9 @@ static noinline __init void detect_machine_type(void)
 		machine_flags |= MACHINE_FLAG_KVM;
 	else
 		machine_flags |= MACHINE_FLAG_VM;
+
+	/* Store machine flags for setting up lowcore early */
+	S390_lowcore.machine_flags = machine_flags;
 }
 
 static __init void early_pgm_check_handler(void)