diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-09-06 07:30:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-09-06 07:30:23 +0200 |
| commit | 9326011edfcb7f7c3ad70f8a1cde6b391604808e (patch) | |
| tree | 2bcf0a42a4a1238ff032ec1255b33171d8491867 /lib | |
| parent | 77e5517cb506c5b1e0a91bf4774cc95452659d77 (diff) | |
| parent | 32b1cbe380417f2ed80f758791179de6b05795ab (diff) | |
Merge branch 'x86/cleanups' into x86/cpu, to pick up dependent changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 29c02a924973..c5892807e06f 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 |