Commit aaae98a8 authored Jan 14, 2018 by Linus Torvalds

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

parents 6bb82119 b8b9ce4b

arch/x86/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -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