Skip to content

Commit aaae98a

Browse files
committed
Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixlet from Thomas Gleixner. Remove a warning about lack of compiler support for retpoline that most people can't do anything about, so it just annoys them needlessly. * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/retpoline: Remove compile time warning
2 parents 6bb8211 + b8b9ce4 commit aaae98a

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

arch/x86/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,6 @@ ifdef CONFIG_RETPOLINE
235235
RETPOLINE_CFLAGS += $(call cc-option,-mindirect-branch=thunk-extern -mindirect-branch-register)
236236
ifneq ($(RETPOLINE_CFLAGS),)
237237
KBUILD_CFLAGS += $(RETPOLINE_CFLAGS) -DRETPOLINE
238-
else
239-
$(warning CONFIG_RETPOLINE=y, but not supported by the compiler. Toolchain update recommended.)
240238
endif
241239
endif
242240

0 commit comments

Comments
 (0)