]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
bug: fix warning suppressions with kunit built as module
authorBartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Wed, 8 Jul 2026 09:54:58 +0000 (11:54 +0200)
committerShuah Khan <skhan@linuxfoundation.org>
Fri, 10 Jul 2026 16:26:58 +0000 (10:26 -0600)
CONFIG_KUNIT is a tristate symbol but the warning suppression code in
lib/bug.c is only built if it's built-in due to it using a plain #ifdef,
rendering warning suppressions broken for kunit build as loadable module.

kunit_is_suppressed_warning() already has a stub for when kunit is
disabled so drop that guard entirely.

Link: https://lore.kernel.org/r/20260708095459.12111-1-bartosz.golaszewski@oss.qualcomm.com
Suggested-by: Albert Esteve <aesteve@redhat.com>
Cc: stable@vger.kernel.org
Fixes: 85347718ab0d ("bug/kunit: Core support for suppressing warning backtraces")
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Reviewed-by: Albert Esteve <aesteve@redhat.com>
Reviewed-by: David Gow <david@davidgow.net>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
lib/bug.c

index 292420f45811a59a86dfcddd2b1c53656522c879..7c1c2c27f58e75f532e7be3f66548467f4caeb16 100644 (file)
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -219,14 +219,12 @@ static enum bug_trap_type __report_bug(struct bug_entry *bug, unsigned long buga
        no_cut   = bug->flags & BUGFLAG_NO_CUT_HERE;
        has_args = bug->flags & BUGFLAG_ARGS;
 
-#ifdef CONFIG_KUNIT
        /*
         * Before the once logic so suppressed warnings do not consume
         * the single-fire budget of WARN_ON_ONCE().
         */
        if (warning && kunit_is_suppressed_warning(true))
                return BUG_TRAP_TYPE_WARN;
-#endif
 
        disable_trace_on_warning();