1 files changed, 5 insertions, 2 deletions

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index f5282e62f87f..2da36c432aea 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -1311,8 +1311,11 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 
         atomic_set(&vcpu->arch.sie_block->cpuflags, CPUSTAT_ZARCH |
                                                     CPUSTAT_SM |
-                                                    CPUSTAT_STOPPED |
-                                                    CPUSTAT_GED);
+                                                    CPUSTAT_STOPPED);
+
+        if (test_kvm_facility(vcpu->kvm, 8))
+                atomic_set_mask(CPUSTAT_GED, &vcpu->arch.sie_block->cpuflags);
+
         kvm_s390_vcpu_setup_model(vcpu);
 
         vcpu->arch.sie_block->ecb   = 6;