diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2019-08-06 19:25:39 +0300 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2019-08-14 10:48:58 +0300 |
| commit | 41b57d1bb8a4084e651c1f9a754fca64952666a0 (patch) | |
| tree | b4d2303b68a9bf7690d8d36ac7a5898808593635 /lib | |
| parent | 4599c6671b8119ed5455e4ed6b967b461c27a9f7 (diff) | |
| download | linux-41b57d1bb8a4084e651c1f9a754fca64952666a0.tar.xz | |
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 <mark.rutland@arm.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Coly Li <colyli@suse.de>
Cc: Gary R Hook <gary.hook@amd.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Kent Overstreet <kent.overstreet@gmail.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Matthew Wilcox <willy@infradead.org>
Link: https://lkml.kernel.org/r/20190806162539.51918-1-mark.rutland@arm.com
Diffstat (limited to 'lib')
| -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 |