diff options
| author |   Sean Paul <seanpaul@chromium.org> | 2017-09-21 14:18:46 -0700 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-09-21 14:18:46 -0700 |
| commit | 1ebfc603d046f1dda6507d11803f9b4046cee712 (patch) | |
| tree | 3be6790f2ce819929b1ccff7993c636e0944705a /mm/pgtable-generic.c | |
| parent | qxl: fix primary surface handling (diff) | |
| parent | Merge tag 'kbuild-fixes-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild (diff) | |
| download | wireguard-linux-1ebfc603d046f1dda6507d11803f9b4046cee712.tar.xz wireguard-linux-1ebfc603d046f1dda6507d11803f9b4046cee712.zip | |
Merge remote-tracking branch 'origin/master' into drm-misc-fixes
Pick up 4.14-rc1
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'mm/pgtable-generic.c')
| -rw-r--r-- | mm/pgtable-generic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/pgtable-generic.c b/mm/pgtable-generic.c index c99d9512a45b..1175f6a24fdb 100644 --- a/mm/pgtable-generic.c +++ b/mm/pgtable-generic.c @@ -124,7 +124,8 @@ pmd_t pmdp_huge_clear_flush(struct vm_area_struct *vma, unsigned long address, { pmd_t pmd; VM_BUG_ON(address & ~HPAGE_PMD_MASK); - VM_BUG_ON(!pmd_trans_huge(*pmdp) && !pmd_devmap(*pmdp)); + VM_BUG_ON((pmd_present(*pmdp) && !pmd_trans_huge(*pmdp) && + !pmd_devmap(*pmdp)) || !pmd_present(*pmdp)); pmd = pmdp_huge_get_and_clear(vma->vm_mm, address, pmdp); flush_pmd_tlb_range(vma, address, address + HPAGE_PMD_SIZE); return pmd; |