[merged mm-nonmm-stable] revert-printf-compile-the-kunit-test-with-disable_branch_profiling-disable_branch_profiling.patch removed from -mm tree

Andrew Morton <[email protected]> Mon, 03 Aug 2026 21:05:14 -0700
Newsgroups org.kernel.vger.mm-commits
Message-ID <[email protected]>
The quilt patch titled
     Subject: Revert "printf: Compile the kunit test with DISABLE_BRANCH_PROFILING DISABLE_BRANCH_PROFILING"
has been removed from the -mm tree.  Its filename was
     revert-printf-compile-the-kunit-test-with-disable_branch_profiling-disable_branch_profiling.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Petr Mladek <[email protected]>
Subject: Revert "printf: Compile the kunit test with DISABLE_BRANCH_PROFILING DISABLE_BRANCH_PROFILING"
Date: Tue, 7 Jul 2026 15:55:22 +0200

This reverts commit 8901ac9d2c7eb8ed7ae5e749bf13ecb3b6062488.

The commit 94bfc7f3b0c7 ("err.h: use __always_inline on all error pointer
helpers") fixes the problem with a dead code elimination by always
inlining IS_ERR() function.  It prevents the related linker failures as
well.

The workaround with disabling branch profiling is not longer necessary.

Link: https://lore.kernel.org/[email protected]
Signed-off-by: Petr Mladek <[email protected]>
Suggested-by: Andy Shevchenko <[email protected]>
Closes: https://lore.kernel.org/r/[email protected]
Reviewed-by: Andy Shevchenko <[email protected]>
Cc: Aleksander Lobakin <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: David Laight <[email protected]>
Cc: Nathan Chancellor <[email protected]>
Cc: Rasmus Villemoes <[email protected]>
Cc: Sergey Senozhatsky <[email protected]>
Cc: Steven Rostedt <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---

 lib/tests/Makefile |    2 --
 1 file changed, 2 deletions(-)

--- a/lib/tests/Makefile~revert-printf-compile-the-kunit-test-with-disable_branch_profiling-disable_branch_profiling
+++ a/lib/tests/Makefile
@@ -41,8 +41,6 @@ obj-$(CONFIG_MEMCPY_KUNIT_TEST) += memcp
 obj-$(CONFIG_MIN_HEAP_KUNIT_TEST) += min_heap_kunit.o
 CFLAGS_overflow_kunit.o = $(call cc-disable-warning, tautological-constant-out-of-range-compare)
 obj-$(CONFIG_OVERFLOW_KUNIT_TEST) += overflow_kunit.o
-# GCC < 12.1 can miscompile errptr() test when branch profiling is enabled.
-CFLAGS_printf_kunit.o += -DDISABLE_BRANCH_PROFILING
 obj-$(CONFIG_PRANDOM_KUNIT_TEST) += random32_kunit.o
 obj-$(CONFIG_PRINTF_KUNIT_TEST) += printf_kunit.o
 obj-$(CONFIG_RANDSTRUCT_KUNIT_TEST) += randstruct_kunit.o
_

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