1 files changed, 4 insertions, 0 deletions

diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 540a67f979b6..68ec4083bf73 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -144,6 +144,10 @@ static noinline __init void detect_machine_type(void)
         /* Running on a P/390 ? */
         if (cpuinfo->cpu_id.machine == 0x7490)
                 machine_flags |= 4;
+
+        /* Running under KVM ? */
+        if (cpuinfo->cpu_id.version == 0xfe)
+                machine_flags |= 64;
 }
 
 #ifdef CONFIG_64BIT