diff options
Diffstat (limited to 'mm/rmap.c')
| -rw-r--r-- | mm/rmap.c | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -601,7 +601,7 @@ pte_t *__page_check_address(struct page *page, struct mm_struct *mm, if (unlikely(PageHuge(page))) { pte = huge_pte_offset(mm, address); - ptl = huge_pte_lockptr(page_hstate(page), mm, pte); + ptl = &mm->page_table_lock; goto check; } @@ -665,23 +665,25 @@ int page_referenced_one(struct page *page, struct vm_area_struct *vma, unsigned long *vm_flags) { struct mm_struct *mm = vma->vm_mm; - spinlock_t *ptl; int referenced = 0; if (unlikely(PageTransHuge(page))) { pmd_t *pmd; + spin_lock(&mm->page_table_lock); /* * rmap might return false positives; we must filter * these out using page_check_address_pmd(). */ pmd = page_check_address_pmd(page, mm, address, - PAGE_CHECK_ADDRESS_PMD_FLAG, &ptl); - if (!pmd) + PAGE_CHECK_ADDRESS_PMD_FLAG); + if (!pmd) { + spin_unlock(&mm->page_table_lock); goto out; + } if (vma->vm_flags & VM_LOCKED) { - spin_unlock(ptl); + spin_unlock(&mm->page_table_lock); *mapcount = 0; /* break early from loop */ *vm_flags |= VM_LOCKED; goto out; @@ -690,9 +692,10 @@ int page_referenced_one(struct page *page, struct vm_area_struct *vma, /* go ahead even if the pmd is pmd_trans_splitting() */ if (pmdp_clear_flush_young_notify(vma, address, pmd)) referenced++; - spin_unlock(ptl); + spin_unlock(&mm->page_table_lock); } else { pte_t *pte; + spinlock_t *ptl; /* * rmap might return false positives; we must filter |