diff options
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c index 33f45edf8272..d86b7b4afd7d 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -1240,7 +1240,7 @@ static inline unsigned long zap_pmd_range(struct mmu_gather *tlb, | |||
1240 | if (next - addr != HPAGE_PMD_SIZE) { | 1240 | if (next - addr != HPAGE_PMD_SIZE) { |
1241 | VM_BUG_ON_VMA(vma_is_anonymous(vma) && | 1241 | VM_BUG_ON_VMA(vma_is_anonymous(vma) && |
1242 | !rwsem_is_locked(&tlb->mm->mmap_sem), vma); | 1242 | !rwsem_is_locked(&tlb->mm->mmap_sem), vma); |
1243 | split_huge_pmd(vma, pmd, addr); | 1243 | __split_huge_pmd(vma, pmd, addr, false, NULL); |
1244 | } else if (zap_huge_pmd(tlb, vma, pmd, addr)) | 1244 | } else if (zap_huge_pmd(tlb, vma, pmd, addr)) |
1245 | goto next; | 1245 | goto next; |
1246 | /* fall through */ | 1246 | /* fall through */ |
@@ -3454,7 +3454,7 @@ static int wp_huge_pmd(struct fault_env *fe, pmd_t orig_pmd) | |||
3454 | 3454 | ||
3455 | /* COW handled on pte level: split pmd */ | 3455 | /* COW handled on pte level: split pmd */ |
3456 | VM_BUG_ON_VMA(fe->vma->vm_flags & VM_SHARED, fe->vma); | 3456 | VM_BUG_ON_VMA(fe->vma->vm_flags & VM_SHARED, fe->vma); |
3457 | split_huge_pmd(fe->vma, fe->pmd, fe->address); | 3457 | __split_huge_pmd(fe->vma, fe->pmd, fe->address, false, NULL); |
3458 | 3458 | ||
3459 | return VM_FAULT_FALLBACK; | 3459 | return VM_FAULT_FALLBACK; |
3460 | } | 3460 | } |