Merge tag 'v5.4-rc7' into sched/core, to pick up fixes

[linux.git] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index 29c02a924973afefc9a95cac47a6dfbcced66993..c5892807e06fa2c940103947d9272c66bcb4982d 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -21,10 +21,6 @@ KCOV_INSTRUMENT_dynamic_debug.o := n
 ifdef CONFIG_AMD_MEM_ENCRYPT
 KASAN_SANITIZE_string.o := n
 
-ifdef CONFIG_FUNCTION_TRACER
-CFLAGS_REMOVE_string.o = -pg
-endif
-
 CFLAGS_string.o := $(call cc-option, -fno-stack-protector)
 endif