author: Josh Poimboeuf <jpoimboe@redhat.com> 2021-01-28 15:52:19 -0600
committer: Borislav Petkov <bp@suse.de> 2021-01-29 18:41:06 +0100
commit: 20bf2b378729c4a0366a53e2018a0b70ace94bcd
parent: 6ee1d745b7c9fd573fba142a2efdad76a9f1cb04
Commit Summary:
Diffstat:
1 file changed, 0 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index e0af7a4a5598..51c2bf34142d 100644
--- a/Makefile
+++ b/Makefile
@@ -948,12 +948,6 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=designated-init)
# change __FILE__ to the relative path from the srctree
KBUILD_CPPFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=)
-# ensure -fcf-protection is disabled when using retpoline as it is
-# incompatible with -mindirect-branch=thunk-extern
-ifdef CONFIG_RETPOLINE
-KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none)
-endif
-
# include additional Makefiles when needed
include-y := scripts/Makefile.extrawarn
include-$(CONFIG_KASAN) += scripts/Makefile.kasan