Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-14 15:30:02 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-14 15:30:02 -0800
commitaaae98a8025bcdd22c986b0168ea8f39d0c4ed10 (patch)
treeb8b45347c6ea7eeef60fff63bdc9eb4a5c6f3630
parent6bb821193b6e8b9cc40714f700da27b4688cbc22 (diff)
parentb8b9ce4b5aec8de9e23cabb0a26b78641f9ab1d6 (diff)
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
-rw-r--r--arch/x86/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index e98f8e2e3708..fad55160dcb9 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -235,8 +235,6 @@ ifdef CONFIG_RETPOLINE
RETPOLINE_CFLAGS += $(call cc-option,-mindirect-branch=thunk-extern -mindirect-branch-register)
ifneq ($(RETPOLINE_CFLAGS),)
KBUILD_CFLAGS += $(RETPOLINE_CFLAGS) -DRETPOLINE
- else
- $(warning CONFIG_RETPOLINE=y, but not supported by the compiler. Toolchain update recommended.)
endif
endif