Skip to contentSkip to conversation

mm-damon-rename-damon_pageout_score-to-damon_cold_score.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Oct 3, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/damon: rename damon_pageout_score() to damon_cold_score()
has been removed from the -mm tree. Its filename was
mm-damon-rename-damon_pageout_score-to-damon_cold_score.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: Kaixu Xia <[email protected]>
Subject: mm/damon: rename damon_pageout_score() to damon_cold_score()
Date: Sat, 17 Sep 2022 21:56:54 +0800

In the beginning there is only one damos_action 'DAMOS_PAGEOUT' that need to get the coldness score of a region for a scheme, which using damon_pageout_score() to do that. But now there are also other damos_action actions need the coldness score, so rename it to damon_cold_score() to make more sense.

---

 mm/damon/ops-common.c |    2 +-
 mm/damon/ops-common.h |    2 +-
 mm/damon/paddr.c      |    4 ++--
 mm/damon/vaddr.c      |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
mm/damon/ops-common.c renamed from mm/damon/ops-common.c~mm-damon-rename-damon_pageout_score-to-damon_cold_score +1 -1
@@ -130,7 +130,7 @@ int damon_hot_score(struct damon_ctx *c,
 	return hotness;
 }
 
-int damon_pageout_score(struct damon_ctx *c, struct damon_region *r,
+int damon_cold_score(struct damon_ctx *c, struct damon_region *r,
 			struct damos *s)
 {
 	int hotness = damon_hot_score(c, r, s);
mm/damon/ops-common.h renamed from mm/damon/ops-common.h~mm-damon-rename-damon_pageout_score-to-damon_cold_score +1 -1
@@ -12,7 +12,7 @@ struct page *damon_get_page(unsigned lon
 void damon_ptep_mkold(pte_t *pte, struct mm_struct *mm, unsigned long addr);
 void damon_pmdp_mkold(pmd_t *pmd, struct mm_struct *mm, unsigned long addr);
 
-int damon_pageout_score(struct damon_ctx *c, struct damon_region *r,
+int damon_cold_score(struct damon_ctx *c, struct damon_region *r,
 			struct damos *s);
 int damon_hot_score(struct damon_ctx *c, struct damon_region *r,
 			struct damos *s);
mm/damon/paddr.c renamed from mm/damon/paddr.c~mm-damon-rename-damon_pageout_score-to-damon_cold_score +2 -2
@@ -287,11 +287,11 @@ static int damon_pa_scheme_score(struct
 {
 	switch (scheme->action) {
 	case DAMOS_PAGEOUT:
-		return damon_pageout_score(context, r, scheme);
+		return damon_cold_score(context, r, scheme);
 	case DAMOS_LRU_PRIO:
 		return damon_hot_score(context, r, scheme);
 	case DAMOS_LRU_DEPRIO:
-		return damon_pageout_score(context, r, scheme);
+		return damon_cold_score(context, r, scheme);
 	default:
 		break;
 	}
mm/damon/vaddr.c renamed from mm/damon/vaddr.c~mm-damon-rename-damon_pageout_score-to-damon_cold_score +1 -1
@@ -673,7 +673,7 @@ static int damon_va_scheme_score(struct
 
 	switch (scheme->action) {
 	case DAMOS_PAGEOUT:
-		return damon_pageout_score(context, r, scheme);
+		return damon_cold_score(context, r, scheme);
 	default:
 		break;
 	}

_

Patches currently in -mm which might be from [email protected] are