Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Jan 2018 23:30:02 +0000 (15:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Jan 2018 23:30:02 +0000 (15:30 -0800)
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

arch/x86/Makefile

index e98f8e2e3708c3f16c548fd7cb8c2ea3590e4f8a..fad55160dcb94a28e60d537d3d69d471a1e10e2e 100644 (file)
@@ -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