KVM: s390: we always have a SCA

Having no sca can never happen, even when something goes wrong when
switching to ESCA. Otherwise we would have a serious bug.
Let's remove this superfluous check.

Acked-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 16c19fb0af8db2c0489083bca7814d85c510eccd..5c58127b752730c395ccc83effd1fafc968e77cb 100644 (file)
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -1608,13 +1608,8 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
        vcpu->arch.sie_block->itdba = (unsigned long) &sie_page->itdb;
 
        vcpu->arch.sie_block->icpua = id;
-       if (!kvm_is_ucontrol(kvm)) {
-               if (!kvm->arch.sca) {
-                       WARN_ON_ONCE(1);
-                       goto out_free_cpu;
-               }
+       if (!kvm_is_ucontrol(kvm))
                sca_add_vcpu(vcpu, kvm, id);
-       }
 
        spin_lock_init(&vcpu->arch.local_int.lock);
        vcpu->arch.local_int.float_int = &kvm->arch.float_int;