Skip to contentSkip to conversation

Revert "printf: Compile the kunit test with DISABLE_BRANCH_PROFILING DISABLE_BRANCH_PROFILING"

PATCH Applied Petr Mladek 2 participants 2 messages Jul 7

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "printf: Compile the kunit test with DISABLE_BRANCH_PROFILING DISABLE_BRANCH_PROFILING"

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.

---
 lib/tests/Makefile | 2 --
 1 file changed, 2 deletions(-)
lib/tests/Makefile +0 -2
index 4ead57602eac..db678ccdd8b1 100644
@@ -41,8 +41,6 @@ obj-$(CONFIG_MEMCPY_KUNIT_TEST) += memcpy_kunit.o
 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_PRINTF_KUNIT_TEST) += printf_kunit.o
 obj-$(CONFIG_RANDSTRUCT_KUNIT_TEST) += randstruct_kunit.o
 obj-$(CONFIG_SCANF_KUNIT_TEST) += scanf_kunit.o
Signature · 1 line
2.54.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Petr Mladek

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.

Signature · 2 lines
With Best Regards,
Andy Shevchenko