linux-kernel - [tip:x86/cleanups] lib: Remove redundant ftrace flag removal

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-41b57d1bb8a4084e651c1f9a754fca64952666a0@git.kernel.org>
Date:   Wed, 14 Aug 2019 00:59:00 -0700
From:   tip-bot for Mark Rutland <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     mark.rutland@....com, mingo@...nel.org, ard.biesheuvel@...aro.org,
        hpa@...or.com, tglx@...utronix.de, willy@...radead.org,
        yamada.masahiro@...ionext.com, colyli@...e.de,
        linux-kernel@...r.kernel.org, keescook@...omium.org,
        kent.overstreet@...il.com, akpm@...ux-foundation.org,
        arnd@...db.de, gary.hook@....com,
        andriy.shevchenko@...ux.intel.com, bp@...e.de
Subject: [tip:x86/cleanups] lib: Remove redundant ftrace flag removal

Commit-ID:  41b57d1bb8a4084e651c1f9a754fca64952666a0
Gitweb:     https://git.kernel.org/tip/41b57d1bb8a4084e651c1f9a754fca64952666a0
Author:     Mark Rutland <mark.rutland@....com>
AuthorDate: Tue, 6 Aug 2019 17:25:39 +0100
Committer:  Borislav Petkov <bp@...e.de>
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 <mark.rutland@....com>
Signed-off-by: Borislav Petkov <bp@...e.de>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@...aro.org>
Cc: Arnd Bergmann <arnd@...db.de>
Cc: Coly Li <colyli@...e.de>
Cc: Gary R Hook <gary.hook@....com>
Cc: Ingo Molnar <mingo@...nel.org>
Cc: Kees Cook <keescook@...omium.org>
Cc: Kent Overstreet <kent.overstreet@...il.com>
Cc: Masahiro Yamada <yamada.masahiro@...ionext.com>
Cc: Matthew Wilcox <willy@...radead.org>
Link: https://lkml.kernel.org/r/20190806162539.51918-1-mark.rutland@arm.com
---
 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
 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