Skip to contentSkip to conversation

mm-damon-core-use-str_high_low-helper-in-damos_wmark_wait_us.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jan 20, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/damon/core: use str_high_low() helper in damos_wmark_wait_us()
has been removed from the -mm tree. Its filename was
mm-damon-core-use-str_high_low-helper-in-damos_wmark_wait_us.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: Thorsten Blum <[email protected]>
Subject: mm/damon/core: use str_high_low() helper in damos_wmark_wait_us()
Date: Thu, 16 Jan 2025 21:42:16 +0100

Remove hard-coded strings by using the str_high_low() helper function.

---

 mm/damon/core.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
mm/damon/core.c renamed from mm/damon/core.c~mm-damon-core-use-str_high_low-helper-in-damos_wmark_wait_us +3 -3
@@ -14,6 +14,7 @@
 #include <linux/psi.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#include <linux/string_choices.h>
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/damon.h>
@@ -2075,9 +2076,8 @@ static unsigned long damos_wmark_wait_us
 	if (metric > scheme->wmarks.high || scheme->wmarks.low > metric) {
 		if (scheme->wmarks.activated)
 			pr_debug("deactivate a scheme (%d) for %s wmark\n",
-					scheme->action,
-					metric > scheme->wmarks.high ?
-					"high" : "low");
+				 scheme->action,
+				 str_high_low(metric > scheme->wmarks.high));
 		scheme->wmarks.activated = false;
 		return scheme->wmarks.interval;
 	}

_

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

ocfs2-use-str_yes_no-and-str_no_yes-helper-functions.patch