mm-damon-move-sz_damon_region-to-damon_sz_region.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon: move sz_damon_region to damon_sz_region
has been removed from the -mm tree. Its filename was
mm-damon-move-sz_damon_region-to-damon_sz_region.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Xin Hao <[email protected]>
Subject: mm/damon: move sz_damon_region to damon_sz_region
Date: Tue, 27 Sep 2022 08:19:45 +0800
Rename sz_damon_region() to damon_sz_region(), and move it to "include/linux/damon.h", because in many places, we can to use this func.
---
include/linux/damon.h | 6 ++++++ mm/damon/core.c | 9 ++------- 2 files changed, 8 insertions(+), 7 deletions(-)
include/linux/damon.h renamed from include/linux/damon.h~mm-damon-move-sz_damon_region-to-damon_sz_region +6 -0
@@ -484,6 +484,12 @@ static inline struct damon_region *damon return list_first_entry(&t->regions_list, struct damon_region, list); } +static inline unsigned long damon_sz_region (struct damon_region *r) +{ +return r->ar.end - r->ar.start; +} + +#define damon_for_each_region (r, t) \ list_for_each_entry(r, &t->regions_list, list)
mm/damon/core.c renamed from mm/damon/core.c~mm-damon-move-sz_damon_region-to-damon_sz_region +2 -7
@@ -864,18 +864,13 @@ static void kdamond_apply_schemes(struct } } -static inline unsigned long sz_damon_region (struct damon_region *r) -{ -return r->ar.end - r->ar.start; -} -/* * Merge two adjacent regions into one region */ static void damon_merge_two_regions (struct damon_target *t,struct damon_region *l,struct damon_region *r) { -unsigned long sz_l =sz_damon_region (l), sz_r =sz_damon_region (r); +unsigned long sz_l =damon_sz_region (l), sz_r =damon_sz_region (r); l->nr_accesses = (l->nr_accesses * sz_l + r->nr_accesses * sz_r) / (sz_l + sz_r);
@@ -904,7 +899,7 @@ static void damon_merge_regions_of(strucif (prev && prev->ar.end == r->ar.start &&abs (prev->nr_accesses - r->nr_accesses) <= thres && -sz_damon_region (prev) +sz_damon_region (r) <= sz_limit) +damon_sz_region (prev) +damon_sz_region (r) <= sz_limit)damon_merge_two_regions (t, prev, r);else prev = r;
_
Patches currently in -mm which might be from [email protected] are
mm-damon-use-damon_sz_region-in-appropriate-place.patch