]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.16-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Sep 2025 06:04:24 +0000 (08:04 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Sep 2025 06:04:24 +0000 (08:04 +0200)
added patches:
samples-damon-prcl-avoid-starting-damon-before-initialization.patch

queue-6.16/samples-damon-prcl-avoid-starting-damon-before-initialization.patch [new file with mode: 0644]
queue-6.16/series

diff --git a/queue-6.16/samples-damon-prcl-avoid-starting-damon-before-initialization.patch b/queue-6.16/samples-damon-prcl-avoid-starting-damon-before-initialization.patch
new file mode 100644 (file)
index 0000000..1c89450
--- /dev/null
@@ -0,0 +1,38 @@
+From e6b733ca2f99e968d696c2e812c8eb8e090bf37b Mon Sep 17 00:00:00 2001
+From: SeongJae Park <sj@kernel.org>
+Date: Mon, 8 Sep 2025 19:22:37 -0700
+Subject: samples/damon/prcl: avoid starting DAMON before initialization
+
+From: SeongJae Park <sj@kernel.org>
+
+commit e6b733ca2f99e968d696c2e812c8eb8e090bf37b upstream.
+
+Commit 2780505ec2b4 ("samples/damon/prcl: fix boot time enable crash") is
+somehow incompletely applying the origin patch [1].  It is missing the
+part that avoids starting DAMON before module initialization.  Probably a
+mistake during a merge has happened.  Fix it by applying the missed part
+again.
+
+Link: https://lkml.kernel.org/r/20250909022238.2989-3-sj@kernel.org
+Link: https://lore.kernel.org/20250706193207.39810-3-sj@kernel.org [1]
+Fixes: 2780505ec2b4 ("samples/damon/prcl: fix boot time enable crash")
+Signed-off-by: SeongJae Park <sj@kernel.org>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ samples/damon/prcl.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/samples/damon/prcl.c
++++ b/samples/damon/prcl.c
+@@ -124,6 +124,9 @@ static int damon_sample_prcl_enable_stor
+       if (enabled == is_enabled)
+               return 0;
++      if (!init_called)
++              return 0;
++
+       if (enabled) {
+               err = damon_sample_prcl_start();
+               if (err)
index 9f1c987c0a96eb28f75033bd0872e60c211426e1..65598989de054279974c0f6dad02f46e8498922e 100644 (file)
@@ -146,3 +146,4 @@ samples-damon-prcl-fix-boot-time-enable-crash.patch
 samples-damon-change-enable-parameters-to-enabled.patch
 samples-damon-mtier-avoid-starting-damon-before-initialization.patch
 clk-sunxi-ng-mp-fix-dual-divider-clock-rate-readback.patch
+samples-damon-prcl-avoid-starting-damon-before-initialization.patch