diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-06-21 09:07:52 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-06-21 09:07:52 +0200 |
| commit | f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9 (patch) | |
| tree | 84d3297b16fa7e373f2eabef56cd12ae5a9b8a29 /virt/kvm/arm/mmu.c | |
| parent | 098b0e01a91c42aaaf0425605cd126b03fcb0bcf (diff) | |
| parent | 8e6cec1c7c5afa489687c90be15d6ed82c742975 (diff) | |
Merge branch 'timers/urgent' into timers/core
Pick up dependent changes.
Diffstat (limited to 'virt/kvm/arm/mmu.c')
| -rw-r--r-- | virt/kvm/arm/mmu.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c index a2d63247d1bb..e2e5effba2a9 100644 --- a/virt/kvm/arm/mmu.c +++ b/virt/kvm/arm/mmu.c @@ -879,6 +879,9 @@ static pmd_t *stage2_get_pmd(struct kvm *kvm, struct kvm_mmu_memory_cache *cache pmd_t *pmd; pud = stage2_get_pud(kvm, cache, addr); + if (!pud) + return NULL; + if (stage2_pud_none(*pud)) { if (!cache) return NULL; |