author: Linus Torvalds <torvalds@linux-foundation.org> 2021-02-07 09:40:47 -0800
committer: Linus Torvalds <torvalds@linux-foundation.org> 2021-02-07 09:40:47 -0800
commit: e24f9c5f6e3127a0679d5ba5575a181b80f219c9
parent: 2db138bb9fa10f5652f55d3c3f427af54626a086
Commit Summary:
Diffstat:
1 file changed, 0 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 01c36d209ab4..70035c522bd3 100644
--- a/Makefile
+++ b/Makefile
@@ -949,12 +949,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