damon_region_access_rate() is not using attrs parameter. Remove it. Signed-off-by: SJ Park --- include/linux/damon.h | 3 +-- mm/damon/core.c | 4 +--- mm/damon/paddr.c | 4 ++-- mm/damon/vaddr.c | 6 +++--- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/include/linux/damon.h b/include/linux/damon.h index 87c1ff479da82..02ed47c558cc2 100644 --- a/include/linux/damon.h +++ b/include/linux/damon.h @@ -1016,8 +1016,7 @@ unsigned int damon_nr_accesses_mvsum(struct damon_region *r, int damon_set_regions(struct damon_target *t, struct damon_addr_range *ranges, unsigned int nr_ranges, unsigned long min_region_sz); -void damon_update_region_access_rate(struct damon_region *r, bool accessed, - struct damon_attrs *attrs); +void damon_update_region_access_rate(struct damon_region *r, bool accessed); struct damos_filter *damos_new_filter(enum damos_filter_type type, bool matching, bool allow); diff --git a/mm/damon/core.c b/mm/damon/core.c index dcd5e484fa442..33c6fade59d37 100644 --- a/mm/damon/core.c +++ b/mm/damon/core.c @@ -3814,15 +3814,13 @@ static unsigned int damon_moving_sum(unsigned int mvsum, unsigned int nomvsum, * damon_update_region_access_rate() - Update the access rate of a region. * @r: The DAMON region to update for its access check result. * @accessed: Whether the region has accessed during last sampling interval. - * @attrs: The damon_attrs of the DAMON context. * * Update the access rate of a region with the region's last sampling interval * access check result. * * Usually this will be called by &damon_operations->check_accesses callback. */ -void damon_update_region_access_rate(struct damon_region *r, bool accessed, - struct damon_attrs *attrs) +void damon_update_region_access_rate(struct damon_region *r, bool accessed) { if (accessed) r->nr_accesses++; diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c index 5c2da45f988cf..8530213086691 100644 --- a/mm/damon/paddr.c +++ b/mm/damon/paddr.c @@ -91,12 +91,12 @@ static void __damon_pa_check_access(struct damon_region *r, /* If the region is in the last checked page, reuse the result */ if (ALIGN_DOWN(last_addr, last_folio_sz) == ALIGN_DOWN(sampling_addr, last_folio_sz)) { - damon_update_region_access_rate(r, last_accessed, attrs); + damon_update_region_access_rate(r, last_accessed); return; } last_accessed = damon_pa_young(sampling_addr, &last_folio_sz); - damon_update_region_access_rate(r, last_accessed, attrs); + damon_update_region_access_rate(r, last_accessed); last_addr = sampling_addr; } diff --git a/mm/damon/vaddr.c b/mm/damon/vaddr.c index e73ec1ce016e5..2eaced0765e26 100644 --- a/mm/damon/vaddr.c +++ b/mm/damon/vaddr.c @@ -501,19 +501,19 @@ static void __damon_va_check_access(struct mm_struct *mm, static bool last_accessed; if (!mm) { - damon_update_region_access_rate(r, false, attrs); + damon_update_region_access_rate(r, false); return; } /* If the region is in the last checked page, reuse the result */ if (same_target && (ALIGN_DOWN(last_addr, last_folio_sz) == ALIGN_DOWN(r->sampling_addr, last_folio_sz))) { - damon_update_region_access_rate(r, last_accessed, attrs); + damon_update_region_access_rate(r, last_accessed); return; } last_accessed = damon_va_young(mm, r->sampling_addr, &last_folio_sz); - damon_update_region_access_rate(r, last_accessed, attrs); + damon_update_region_access_rate(r, last_accessed); last_addr = r->sampling_addr; } -- 2.47.3