From: Greg Kroah-Hartman Date: Mon, 22 Sep 2025 06:04:24 +0000 (+0200) Subject: 6.16-stable patches X-Git-Tag: v6.1.154~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5def3241e4fa79cb7797c37e97b5636c24ca3ca;p=thirdparty%2Fkernel%2Fstable-queue.git 6.16-stable patches added patches: samples-damon-prcl-avoid-starting-damon-before-initialization.patch --- 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 index 0000000000..1c894503f1 --- /dev/null +++ b/queue-6.16/samples-damon-prcl-avoid-starting-damon-before-initialization.patch @@ -0,0 +1,38 @@ +From e6b733ca2f99e968d696c2e812c8eb8e090bf37b Mon Sep 17 00:00:00 2001 +From: SeongJae Park +Date: Mon, 8 Sep 2025 19:22:37 -0700 +Subject: samples/damon/prcl: avoid starting DAMON before initialization + +From: SeongJae Park + +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 +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + 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) diff --git a/queue-6.16/series b/queue-6.16/series index 9f1c987c0a..65598989de 100644 --- a/queue-6.16/series +++ b/queue-6.16/series @@ -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