kbuild: trace functions in subdirectories of lib/

ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)

exists here in sub-directories of lib/ to keep the behavior of
commit 2464a609ded0 ("ftrace: do not trace library functions").

Since that commit, not only the objects in lib/ but also the ones in
the sub-directories are excluded from ftrace (although the commit
description did not explicitly mention this).

However, most of library functions in sub-directories are not so hot.
Re-add them to ftrace.

Going forward, only the objects right under lib/ will be excluded.

Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/lib/842/Makefile b/lib/842/Makefile
index b815e824ae37e694548b3a7e7670e1227aa661d7..6f7aad2692887d69fc40ed06449a830079e51f6a 100644 (file)
--- a/lib/842/Makefile
+++ b/lib/842/Makefile
@@ -1,6 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
-
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
-
 obj-$(CONFIG_842_COMPRESS) += 842_compress.o
 obj-$(CONFIG_842_DECOMPRESS) += 842_decompress.o

diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile
index b557ef0b07c295f679a5bd5affeb0c89ae9131a6..3a435629d9ce9c4806f75068d1891dad411556e6 100644 (file)
--- a/lib/crypto/Makefile
+++ b/lib/crypto/Makefile
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
 
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
-
 # chacha is used by the /dev/random driver which is always builtin
 obj-y                                          += chacha.o
 obj-$(CONFIG_CRYPTO_LIB_CHACHA_GENERIC)                += libchacha.o

diff --git a/lib/dim/Makefile b/lib/dim/Makefile
index 97fc3e89d34e9e96089245b071813bf8506a6ed7..1d6858a108cb8f0a4c859f354c23ae3244bfbd8a 100644 (file)
--- a/lib/dim/Makefile
+++ b/lib/dim/Makefile
@@ -2,8 +2,6 @@
 # DIM Dynamic Interrupt Moderation library
 #
 
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
-
 obj-$(CONFIG_DIMLIB) += dim.o
 
 dim-y := dim.o net_dim.o rdma_dim.o

diff --git a/lib/fonts/Makefile b/lib/fonts/Makefile
index f951750c179e7273dda2fc892c2061ff62d33c2d..ed95070860deb0c4fb06fca7f360505e88889506 100644 (file)
--- a/lib/fonts/Makefile
+++ b/lib/fonts/Makefile
@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 # Font handling
 
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
-
 font-objs := fonts.o
 
 font-objs-$(CONFIG_FONT_SUN8x16)   += font_sun8x16.o

diff --git a/lib/kunit/Makefile b/lib/kunit/Makefile
index 8c847557ab24a9b7a64ee9fcfb24471de5d22e98..724b94311ca365367b4acf4279f62a34784362cf 100644 (file)
--- a/lib/kunit/Makefile
+++ b/lib/kunit/Makefile
@@ -1,6 +1,3 @@
-
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
-
 obj-$(CONFIG_KUNIT) +=                 kunit.o
 
 kunit-objs +=                          test.o \

diff --git a/lib/livepatch/Makefile b/lib/livepatch/Makefile
index 9abdf615b0884f75b81729d0adcd027a7f66beef..dcc912b3478fe3a40aa5e56a86a6a8925ce02c75 100644 (file)
--- a/lib/livepatch/Makefile
+++ b/lib/livepatch/Makefile
@@ -2,8 +2,6 @@
 #
 # Makefile for livepatch test code.
 
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
-
 obj-$(CONFIG_TEST_LIVEPATCH) += test_klp_atomic_replace.o \
                                test_klp_callbacks_demo.o \
                                test_klp_callbacks_demo2.o \
@@ -14,7 +12,3 @@ obj-$(CONFIG_TEST_LIVEPATCH) += test_klp_atomic_replace.o \
                                test_klp_state.o \
                                test_klp_state2.o \
                                test_klp_state3.o
-
-# Target modules to be livepatched require CC_FLAGS_FTRACE
-CFLAGS_test_klp_callbacks_busy.o       += $(CC_FLAGS_FTRACE)
-CFLAGS_test_klp_callbacks_mod.o                += $(CC_FLAGS_FTRACE)

diff --git a/lib/lz4/Makefile b/lib/lz4/Makefile
index 53da4cab701517d7faa80ba465b3d5081b2cc410..5b42242afaa20deb165d8a2f0b1c0c842dfcdc39 100644 (file)
--- a/lib/lz4/Makefile
+++ b/lib/lz4/Makefile
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
 ccflags-y += -O3
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
 
 obj-$(CONFIG_LZ4_COMPRESS) += lz4_compress.o
 obj-$(CONFIG_LZ4HC_COMPRESS) += lz4hc_compress.o

diff --git a/lib/lzo/Makefile b/lib/lzo/Makefile
index 9565a555275b8eac72d839dbcfdf4245999ba756..2f58fafbbdddc09ce803d92c504b580661e53bc6 100644 (file)
--- a/lib/lzo/Makefile
+++ b/lib/lzo/Makefile
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
-
 lzo_compress-objs := lzo1x_compress.o
 lzo_decompress-objs := lzo1x_decompress_safe.o
 

diff --git a/lib/math/Makefile b/lib/math/Makefile
index 49aa50e28185e6bd0b76bb83b8f65928f1dfa96d..be6909e943bdd7f95b01352c0e0ab886d427a511 100644 (file)
--- a/lib/math/Makefile
+++ b/lib/math/Makefile
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
-
 obj-y += div64.o gcd.o lcm.o int_pow.o int_sqrt.o reciprocal_div.o
 
 obj-$(CONFIG_CORDIC)           += cordic.o

diff --git a/lib/mpi/Makefile b/lib/mpi/Makefile
index df7883521619c66f7912d266b9fe1c08e04f9f54..d5874a7f5ff9792e2e068ee370719c93f90a6239 100644 (file)
--- a/lib/mpi/Makefile
+++ b/lib/mpi/Makefile
@@ -3,8 +3,6 @@
 # MPI multiprecision maths library (from gpg)
 #
 
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
-
 obj-$(CONFIG_MPILIB) = mpi.o
 
 mpi-y = \

diff --git a/lib/raid6/Makefile b/lib/raid6/Makefile
index 3482d6ae3f3bb264f6595be878b82fb54d1419af..b4c0df6d706dcb5c8026abd07b894d008cad59c6 100644 (file)
--- a/lib/raid6/Makefile
+++ b/lib/raid6/Makefile
@@ -1,7 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
-
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
-
 obj-$(CONFIG_RAID6_PQ) += raid6_pq.o
 
 raid6_pq-y     += algos.o recov.o tables.o int1.o int2.o int4.o \

diff --git a/lib/reed_solomon/Makefile b/lib/reed_solomon/Makefile
index a5c9defdac7f2890714a5f82e2da3e6f604b1991..5d4fa68f26cbbab525fa1dd06b6000789e69a2cc 100644 (file)
--- a/lib/reed_solomon/Makefile
+++ b/lib/reed_solomon/Makefile
@@ -3,7 +3,5 @@
 # This is a modified version of reed solomon lib,
 #
 
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
-
 obj-$(CONFIG_REED_SOLOMON) += reed_solomon.o
 obj-$(CONFIG_REED_SOLOMON_TEST) += test_rslib.o

diff --git a/lib/xz/Makefile b/lib/xz/Makefile
index fae9b6c7c389f2f49c39da46811b75fd68897314..fa6af814a8d1572da364fdd77ef3a55104ee40bf 100644 (file)
--- a/lib/xz/Makefile
+++ b/lib/xz/Makefile
@@ -1,7 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
-
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
-
 obj-$(CONFIG_XZ_DEC) += xz_dec.o
 xz_dec-y := xz_dec_syms.o xz_dec_stream.o xz_dec_lzma2.o
 xz_dec-$(CONFIG_XZ_DEC_BCJ) += xz_dec_bcj.o

diff --git a/lib/zlib_deflate/Makefile b/lib/zlib_deflate/Makefile
index 1fcefe73536f34dc0f937665da8aa5b0c0a8d81c..2622e03c0b942f839d6600d66d9fd1b32a468899 100644 (file)
--- a/lib/zlib_deflate/Makefile
+++ b/lib/zlib_deflate/Makefile
@@ -7,8 +7,6 @@
 # decompression code.
 #
 
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
-
 obj-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate.o
 
 zlib_deflate-objs := deflate.o deftree.o deflate_syms.o

diff --git a/lib/zlib_dfltcc/Makefile b/lib/zlib_dfltcc/Makefile
index 7a8067f6e772fb0e3a3604bc8341f4ef8f5df91a..8e4d5afbbb1094c337c0a0b95b815f3f83234efe 100644 (file)
--- a/lib/zlib_dfltcc/Makefile
+++ b/lib/zlib_dfltcc/Makefile
@@ -6,8 +6,6 @@
 # This is the code for s390 zlib hardware support.
 #
 
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
-
 obj-$(CONFIG_ZLIB_DFLTCC) += zlib_dfltcc.o
 
 zlib_dfltcc-objs := dfltcc.o dfltcc_deflate.o dfltcc_inflate.o dfltcc_syms.o

diff --git a/lib/zlib_inflate/Makefile b/lib/zlib_inflate/Makefile
index a451e96f9845aeb0670bcae9096cfe6d191948de..27327d3e9f5410e70b28b7dc7a70c82b85795b9d 100644 (file)
--- a/lib/zlib_inflate/Makefile
+++ b/lib/zlib_inflate/Makefile
@@ -14,8 +14,6 @@
 # uncompression can be done without blocking on allocation).
 #
 
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
-
 obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate.o
 
 zlib_inflate-objs := inffast.o inflate.o infutil.o \

diff --git a/lib/zstd/Makefile b/lib/zstd/Makefile
index 01be908a2d946fc9e36931baa802bcd9111e3f0e..f5d778e7e5c72da62daf2b826c9fb8e56eba92cb 100644 (file)
--- a/lib/zstd/Makefile
+++ b/lib/zstd/Makefile
@@ -3,7 +3,6 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd_compress.o
 obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd_decompress.o
 
 ccflags-y += -O3
-ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
 
 zstd_compress-y := fse_compress.o huf_compress.o compress.o \
                   entropy_common.o fse_decompress.o zstd_common.o