diff options
| -rw-r--r-- | mm/internal.h | 8 | ||||
| -rw-r--r-- | mm/vmscan.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mm/internal.h b/mm/internal.h index 321b8019de9f..1b718fdb074e 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1819,7 +1819,7 @@ static inline int pmdp_clear_flush_young_notify(struct vm_area_struct *vma, return young; } -static inline int ptep_clear_young_notify(struct vm_area_struct *vma, +static inline int ptep_test_and_clear_young_notify(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep) { int young; @@ -1829,7 +1829,7 @@ static inline int ptep_clear_young_notify(struct vm_area_struct *vma, return young; } -static inline int pmdp_clear_young_notify(struct vm_area_struct *vma, +static inline int pmdp_test_and_clear_young_notify(struct vm_area_struct *vma, unsigned long addr, pmd_t *pmdp) { int young; @@ -1843,8 +1843,8 @@ static inline int pmdp_clear_young_notify(struct vm_area_struct *vma, #define clear_flush_young_ptes_notify clear_flush_young_ptes #define pmdp_clear_flush_young_notify pmdp_clear_flush_young -#define ptep_clear_young_notify ptep_test_and_clear_young -#define pmdp_clear_young_notify pmdp_test_and_clear_young +#define ptep_test_and_clear_young_notify ptep_test_and_clear_young +#define pmdp_test_and_clear_young_notify pmdp_test_and_clear_young #endif /* CONFIG_MMU_NOTIFIER */ diff --git a/mm/vmscan.c b/mm/vmscan.c index 4ab461f8c65a..7ab9e1cdccd2 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3533,7 +3533,7 @@ restart: if (!folio) continue; - if (!ptep_clear_young_notify(args->vma, addr, pte + i)) + if (!ptep_test_and_clear_young_notify(args->vma, addr, pte + i)) continue; if (last != folio) { @@ -3624,7 +3624,7 @@ static void walk_pmd_range_locked(pud_t *pud, unsigned long addr, struct vm_area if (!folio) goto next; - if (!pmdp_clear_young_notify(vma, addr, pmd + i)) + if (!pmdp_test_and_clear_young_notify(vma, addr, pmd + i)) goto next; if (last != folio) { @@ -4214,7 +4214,7 @@ bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw) lockdep_assert_held(pvmw->ptl); VM_WARN_ON_ONCE_FOLIO(folio_test_lru(folio), folio); - if (!ptep_clear_young_notify(vma, addr, pte)) + if (!ptep_test_and_clear_young_notify(vma, addr, pte)) return false; if (spin_is_contended(pvmw->ptl)) @@ -4260,7 +4260,7 @@ bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw) if (!folio) continue; - if (!ptep_clear_young_notify(vma, addr, pte + i)) + if (!ptep_test_and_clear_young_notify(vma, addr, pte + i)) continue; if (last != folio) { |