aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Hildenbrand <dahi@linux.vnet.ibm.com>2015-10-12 06:34:19 -0400
committerChristian Borntraeger <borntraeger@de.ibm.com>2015-11-30 06:47:09 -0500
commit5f3fe620a56f2f5c79e89522107f2476a45ed6ce (patch)
tree0fcd601678b6c8244cc24bc4c3a024fc8be998c0
parent2c1bb2be986c56848ce92ba41ba32fc62ab3165f (diff)
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>
-rw-r--r--arch/s390/kvm/kvm-s390.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 16c19fb0af8d..5c58127b7527 100644
--- 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,
1608 vcpu->arch.sie_block->itdba = (unsigned long) &sie_page->itdb; 1608 vcpu->arch.sie_block->itdba = (unsigned long) &sie_page->itdb;
1609 1609
1610 vcpu->arch.sie_block->icpua = id; 1610 vcpu->arch.sie_block->icpua = id;
1611 if (!kvm_is_ucontrol(kvm)) { 1611 if (!kvm_is_ucontrol(kvm))
1612 if (!kvm->arch.sca) {
1613 WARN_ON_ONCE(1);
1614 goto out_free_cpu;
1615 }
1616 sca_add_vcpu(vcpu, kvm, id); 1612 sca_add_vcpu(vcpu, kvm, id);
1617 }
1618 1613
1619 spin_lock_init(&vcpu->arch.local_int.lock); 1614 spin_lock_init(&vcpu->arch.local_int.lock);
1620 vcpu->arch.local_int.float_int = &kvm->arch.float_int; 1615 vcpu->arch.local_int.float_int = &kvm->arch.float_int;