Commit dae0087a authored by SeongJae Park's avatar SeongJae Park Committed by Andrew Morton

mm/damon/vaddr: remove damon_va_apply_three_regions()

'damon_va_apply_three_regions()' is just a wrapper of its general version,
'damon_set_regions()'.  This commit replaces the wrapper calls to directly
call the general version.

Link: https://lkml.kernel.org/r/20220429160606.127307-6-sj@kernel.orgSigned-off-by: default avatarSeongJae Park <sj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent d0723bc0
...@@ -109,7 +109,7 @@ static struct damon_region *__nth_region_of(struct damon_target *t, int idx) ...@@ -109,7 +109,7 @@ static struct damon_region *__nth_region_of(struct damon_target *t, int idx)
} }
/* /*
* Test 'damon_va_apply_three_regions()' * Test 'damon_set_regions()'
* *
* test kunit object * test kunit object
* regions an array containing start/end addresses of current * regions an array containing start/end addresses of current
...@@ -124,7 +124,7 @@ static struct damon_region *__nth_region_of(struct damon_target *t, int idx) ...@@ -124,7 +124,7 @@ static struct damon_region *__nth_region_of(struct damon_target *t, int idx)
* the change, DAMON periodically reads the mappings, simplifies it to the * the change, DAMON periodically reads the mappings, simplifies it to the
* three regions, and updates the monitoring target regions to fit in the three * three regions, and updates the monitoring target regions to fit in the three
* regions. The update of current target regions is the role of * regions. The update of current target regions is the role of
* 'damon_va_apply_three_regions()'. * 'damon_set_regions()'.
* *
* This test passes the given target regions and the new three regions that * This test passes the given target regions and the new three regions that
* need to be applied to the function and check whether it updates the regions * need to be applied to the function and check whether it updates the regions
...@@ -145,7 +145,7 @@ static void damon_do_test_apply_three_regions(struct kunit *test, ...@@ -145,7 +145,7 @@ static void damon_do_test_apply_three_regions(struct kunit *test,
damon_add_region(r, t); damon_add_region(r, t);
} }
damon_va_apply_three_regions(t, three_regions); damon_set_regions(t, three_regions, 3);
for (i = 0; i < nr_expected / 2; i++) { for (i = 0; i < nr_expected / 2; i++) {
r = __nth_region_of(t, i); r = __nth_region_of(t, i);
......
...@@ -281,22 +281,6 @@ static void damon_va_init(struct damon_ctx *ctx) ...@@ -281,22 +281,6 @@ static void damon_va_init(struct damon_ctx *ctx)
} }
} }
/*
* Functions for the dynamic monitoring target regions update
*/
/*
* Update damon regions for the three big regions of the given target
*
* t the given target
* bregions the three big regions of the target
*/
static void damon_va_apply_three_regions(struct damon_target *t,
struct damon_addr_range bregions[3])
{
damon_set_regions(t, bregions, 3);
}
/* /*
* Update regions for current memory mappings * Update regions for current memory mappings
*/ */
...@@ -308,7 +292,7 @@ static void damon_va_update(struct damon_ctx *ctx) ...@@ -308,7 +292,7 @@ static void damon_va_update(struct damon_ctx *ctx)
damon_for_each_target(t, ctx) { damon_for_each_target(t, ctx) {
if (damon_va_three_regions(t, three_regions)) if (damon_va_three_regions(t, three_regions))
continue; continue;
damon_va_apply_three_regions(t, three_regions); damon_set_regions(t, three_regions, 3);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment