git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
[pandora-kernel.git]
/
arch
/
s390
/
kvm
/
kvm-s390.h
diff --git
a/arch/s390/kvm/kvm-s390.h
b/arch/s390/kvm/kvm-s390.h
index
60f09ab
..
cfa9d17
100644
(file)
--- a/
arch/s390/kvm/kvm-s390.h
+++ b/
arch/s390/kvm/kvm-s390.h
@@
-72,7
+72,7
@@
static inline void kvm_s390_vcpu_set_mem(struct kvm_vcpu *vcpu)
struct kvm_memslots *memslots;
idx = srcu_read_lock(&vcpu->kvm->srcu);
- memslots =
rcu_dereference(vcpu->kvm->memslots
);
+ memslots =
kvm_memslots(vcpu->kvm
);
mem = &memslots->memslots[0];