diff options
author | Mark Rutland <[email protected]> | 2019-08-06 17:25:39 +0100 |
---|---|---|
committer | Borislav Petkov <[email protected]> | 2019-08-14 09:48:58 +0200 |
commit | 41b57d1bb8a4084e651c1f9a754fca64952666a0 (patch) | |
tree | b4d2303b68a9bf7690d8d36ac7a5898808593635 | |
parent | 4599c6671b8119ed5455e4ed6b967b461c27a9f7 (diff) |
lib: Remove redundant ftrace flag removal
Since architectures can implement ftrace using a variety of mechanisms,
generic code should always use CC_FLAGS_FTRACE rather than assuming that
ftrace is built using -pg.
Since commit:
2464a609ded09420 ("ftrace: do not trace library functions")
... lib/Makefile has removed CC_FLAGS_FTRACE from KBUILD_CFLAGS, so ftrace is
disabled for all files under lib/.
Given that, we shouldn't explicitly remove -pg when building
lib/string.o, as this is redundant and bad form.
Clean things up accordingly.
There should be no functional change as a result of this patch.
Signed-off-by: Mark Rutland <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Andy Shevchenko <[email protected]>
Cc: Ard Biesheuvel <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Coly Li <[email protected]>
Cc: Gary R Hook <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Kees Cook <[email protected]>
Cc: Kent Overstreet <[email protected]>
Cc: Masahiro Yamada <[email protected]>
Cc: Matthew Wilcox <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
-rw-r--r-- | lib/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/Makefile b/lib/Makefile index 095601ce371d..34f8a83b2cbd 100644 --- 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 |