diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-15 00:30:02 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-15 00:30:02 +0100 |
| commit | aaae98a8025bcdd22c986b0168ea8f39d0c4ed10 (patch) | |
| tree | b8b45347c6ea7eeef60fff63bdc9eb4a5c6f3630 /arch | |
| parent | Merge tag 'powerpc-4.15-7' of git://git.kernel.org/pub/scm/linux/kernel/git/p... (diff) | |
| parent | x86/retpoline: Remove compile time warning (diff) | |
| download | linux-aaae98a8025bcdd22c986b0168ea8f39d0c4ed10.tar.xz linux-aaae98a8025bcdd22c986b0168ea8f39d0c4ed10.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Makefile | 2 |
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 |