]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
samples/damon/mtier: avoid starting DAMON before initialization
authorSeongJae Park <sj@kernel.org>
Sun, 21 Sep 2025 14:11:19 +0000 (10:11 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Sep 2025 09:16:54 +0000 (11:16 +0200)
[ Upstream commit c62cff40481c037307a13becbda795f7afdcfebd ]

Commit 964314344eab ("samples/damon/mtier: support boot time enable
setup") 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-4-sj@kernel.org
Link: https://lore.kernel.org/20250706193207.39810-4-sj@kernel.org
Fixes: 964314344eab ("samples/damon/mtier: support boot time enable setup")
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: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
samples/damon/mtier.c

index 11cbfea1af67549dbdd208fa50b4982ede5df6f6..88156145172f17d82d2bcd8726e6fbb5a5886a00 100644 (file)
@@ -166,6 +166,9 @@ static int damon_sample_mtier_enable_store(
        if (enabled == is_enabled)
                return 0;
 
+       if (!init_called)
+               return 0;
+
        if (enabled) {
                err = damon_sample_mtier_start();
                if (err)