diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-09-08 04:02:35 (GMT) |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-09-08 04:02:35 (GMT) |
commit | 537c78fc2374e2220f29f42f974ed4bce6bfe1ae (patch) | |
tree | 51747cc16cfc17d2de714bdbe929a42ef1286b39 /arch/arm | |
parent | f9ded7bcde96b12ea7dc81c85c09a98a71160652 (diff) | |
parent | 8a697a50c090053cf6c53a096972dd841332fe59 (diff) | |
download | linux-537c78fc2374e2220f29f42f974ed4bce6bfe1ae.tar.xz |
Merge tag 'v4.9.48' into linux-linaro-lsk-v4.9
This is the 4.9.48 stable release
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/kvm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index 0c060c5..2206e0e 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -837,7 +837,7 @@ void kvm_free_stage2_pgd(struct kvm *kvm) spin_lock(&kvm->mmu_lock); if (kvm->arch.pgd) { unmap_stage2_range(kvm, 0, KVM_PHYS_SIZE); - pgd = kvm->arch.pgd; + pgd = READ_ONCE(kvm->arch.pgd); kvm->arch.pgd = NULL; } spin_unlock(&kvm->mmu_lock); |