Message ID | 20240724011037.3671523-5-jthoughton@google.com (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | mm: multi-gen LRU: Walk secondary MMU page tables while aging | expand |
On 24.07.24 03:10, James Houghton wrote: > Remove the now unnecessary ifdef in mm/damon/vaddr.c as well. > > Signed-off-by: James Houghton <jthoughton@google.com> > --- > include/linux/mmu_notifier.h | 7 +++++++ > mm/damon/vaddr.c | 2 -- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h > index d39ebb10caeb..e2dd57ca368b 100644 > --- a/include/linux/mmu_notifier.h > +++ b/include/linux/mmu_notifier.h > @@ -606,6 +606,13 @@ static inline int mmu_notifier_clear_flush_young(struct mm_struct *mm, > return 0; > } > > +static inline int mmu_notifier_clear_young(struct mm_struct *mm, > + unsigned long start, > + unsigned long end) > +{ > + return 0; > +} > + > static inline int mmu_notifier_test_young(struct mm_struct *mm, > unsigned long address) > { > diff --git a/mm/damon/vaddr.c b/mm/damon/vaddr.c > index 381559e4a1fa..a453d77565e6 100644 > --- a/mm/damon/vaddr.c > +++ b/mm/damon/vaddr.c > @@ -351,11 +351,9 @@ static void damon_hugetlb_mkold(pte_t *pte, struct mm_struct *mm, > set_huge_pte_at(mm, addr, pte, entry, psize); > } > > -#ifdef CONFIG_MMU_NOTIFIER > if (mmu_notifier_clear_young(mm, addr, > addr + huge_page_size(hstate_vma(vma)))) > referenced = true; > -#endif /* CONFIG_MMU_NOTIFIER */ > > if (referenced) > folio_set_young(folio); Acked-by: David Hildenbrand <david@redhat.com>
diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h index d39ebb10caeb..e2dd57ca368b 100644 --- a/include/linux/mmu_notifier.h +++ b/include/linux/mmu_notifier.h @@ -606,6 +606,13 @@ static inline int mmu_notifier_clear_flush_young(struct mm_struct *mm, return 0; } +static inline int mmu_notifier_clear_young(struct mm_struct *mm, + unsigned long start, + unsigned long end) +{ + return 0; +} + static inline int mmu_notifier_test_young(struct mm_struct *mm, unsigned long address) { diff --git a/mm/damon/vaddr.c b/mm/damon/vaddr.c index 381559e4a1fa..a453d77565e6 100644 --- a/mm/damon/vaddr.c +++ b/mm/damon/vaddr.c @@ -351,11 +351,9 @@ static void damon_hugetlb_mkold(pte_t *pte, struct mm_struct *mm, set_huge_pte_at(mm, addr, pte, entry, psize); } -#ifdef CONFIG_MMU_NOTIFIER if (mmu_notifier_clear_young(mm, addr, addr + huge_page_size(hstate_vma(vma)))) referenced = true; -#endif /* CONFIG_MMU_NOTIFIER */ if (referenced) folio_set_young(folio);
Remove the now unnecessary ifdef in mm/damon/vaddr.c as well. Signed-off-by: James Houghton <jthoughton@google.com> --- include/linux/mmu_notifier.h | 7 +++++++ mm/damon/vaddr.c | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-)