[lkml]   [2019]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[tip:x86/cleanups] lib: Remove redundant ftrace flag removal
Commit-ID:  41b57d1bb8a4084e651c1f9a754fca64952666a0
Author: Mark Rutland <>
AuthorDate: Tue, 6 Aug 2019 17:25:39 +0100
Committer: Borislav Petkov <>
CommitDate: Wed, 14 Aug 2019 09:48:58 +0200

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 <>
Signed-off-by: Borislav Petkov <>
Cc: Andrew Morton <>
Cc: Andy Shevchenko <>
Cc: Ard Biesheuvel <>
Cc: Arnd Bergmann <>
Cc: Coly Li <>
Cc: Gary R Hook <>
Cc: Ingo Molnar <>
Cc: Kees Cook <>
Cc: Kent Overstreet <>
Cc: Masahiro Yamada <>
Cc: Matthew Wilcox <>
lib/Makefile | 4 ----
1 file changed, 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
KASAN_SANITIZE_string.o := n

-CFLAGS_REMOVE_string.o = -pg
CFLAGS_string.o := $(call cc-option, -fno-stack-protector)

 \ /
  Last update: 2019-08-14 10:02    [W:0.031 / U:4.844 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site