summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorJunaid Shahid2019-01-04 02:14:28 +0100
committerPaolo Bonzini2019-06-05 14:14:50 +0200
commit0d9ce162cf46c99628cc5da9510b959c7976735b (patch)
treecb7670bedf8c614aa20313b95456f942fd16b6d4 /arch/s390
parentKVM: VMX: remove unneeded 'asm volatile ("")' from vmcs_write64 (diff)
downloadkernel-qcow2-linux-0d9ce162cf46c99628cc5da9510b959c7976735b.tar.gz
kernel-qcow2-linux-0d9ce162cf46c99628cc5da9510b959c7976735b.tar.xz
kernel-qcow2-linux-0d9ce162cf46c99628cc5da9510b959c7976735b.zip
kvm: Convert kvm_lock to a mutex
It doesn't seem as if there is any particular need for kvm_lock to be a spinlock, so convert the lock to a mutex so that sleepable functions (in particular cond_resched()) can be called while holding it. Signed-off-by: Junaid Shahid <junaids@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kvm/kvm-s390.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 7936af0a971f..0fef9192f6ac 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -2423,13 +2423,13 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
kvm->arch.sca = (struct bsca_block *) get_zeroed_page(alloc_flags);
if (!kvm->arch.sca)
goto out_err;
- spin_lock(&kvm_lock);
+ mutex_lock(&kvm_lock);
sca_offset += 16;
if (sca_offset + sizeof(struct bsca_block) > PAGE_SIZE)
sca_offset = 0;
kvm->arch.sca = (struct bsca_block *)
((char *) kvm->arch.sca + sca_offset);
- spin_unlock(&kvm_lock);
+ mutex_unlock(&kvm_lock);
sprintf(debug_name, "kvm-%u", current->pid);