4.19-stable patches

added patches:
	x86-build-fix-compiler-support-check-for-config_retpoline.patch

diff --git a/queue-4.19/series b/queue-4.19/series
index ffffa423f44cf7bf6b79df8d8ebe89ccfd9a1bc4..a16324fad844d7008dc93c6c93fa68ad2165b5e3 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -41,3 +41,4 @@ drm-amdgpu-add-some-additional-vega10-pci-ids.patch
 drm-amdgpu-update-smu-firmware-images-for-vi-variants-v2.patch
 drm-amdgpu-update-smc-firmware-image-for-polaris10-variants.patch
 dm-zoned-fix-target-bio-completion-handling.patch
+x86-build-fix-compiler-support-check-for-config_retpoline.patch

diff --git a/queue-4.19/x86-build-fix-compiler-support-check-for-config_retpoline.patch b/queue-4.19/x86-build-fix-compiler-support-check-for-config_retpoline.patch
new file mode 100644 (file)
index 0000000..5141cb3
--- /dev/null
+++ b/queue-4.19/x86-build-fix-compiler-support-check-for-config_retpoline.patch
@@ -0,0 +1,68 @@
+From 25896d073d8a0403b07e6dec56f58e6c33678207 Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+Date: Wed, 5 Dec 2018 15:27:19 +0900
+Subject: x86/build: Fix compiler support check for CONFIG_RETPOLINE
+
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+
+commit 25896d073d8a0403b07e6dec56f58e6c33678207 upstream.
+
+It is troublesome to add a diagnostic like this to the Makefile
+parse stage because the top-level Makefile could be parsed with
+a stale include/config/auto.conf.
+
+Once you are hit by the error about non-retpoline compiler, the
+compilation still breaks even after disabling CONFIG_RETPOLINE.
+
+The easiest fix is to move this check to the "archprepare" like
+this commit did:
+
+  829fe4aa9ac1 ("x86: Allow generating user-space headers without a compiler")
+
+Reported-by: Meelis Roos <mroos@linux.ee>
+Tested-by: Meelis Roos <mroos@linux.ee>
+Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+Acked-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
+Cc: Borislav Petkov <bp@alien8.de>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Zhenzhong Duan <zhenzhong.duan@oracle.com>
+Fixes: 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support")
+Link: http://lkml.kernel.org/r/1543991239-18476-1-git-send-email-yamada.masahiro@socionext.com
+Link: https://lkml.org/lkml/2018/12/4/206
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Cc: Gi-Oh Kim <gi-oh.kim@cloud.ionos.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/Makefile |   10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+--- a/arch/x86/Makefile
++++ b/arch/x86/Makefile
+@@ -223,9 +223,6 @@ KBUILD_CFLAGS += -fno-asynchronous-unwin
+ 
+ # Avoid indirect branches in kernel to deal with Spectre
+ ifdef CONFIG_RETPOLINE
+-ifeq ($(RETPOLINE_CFLAGS),)
+-  $(error You are building kernel with non-retpoline compiler, please update your compiler.)
+-endif
+   KBUILD_CFLAGS += $(RETPOLINE_CFLAGS)
+ endif
+ 
+@@ -303,6 +300,13 @@ ifndef CC_HAVE_ASM_GOTO
+       @echo Compiler lacks asm-goto support.
+       @exit 1
+ endif
++ifdef CONFIG_RETPOLINE
++ifeq ($(RETPOLINE_CFLAGS),)
++      @echo "You are building kernel with non-retpoline compiler." >&2
++      @echo "Please update your compiler." >&2
++      @false
++endif
++endif
+ 
+ archclean:
+       $(Q)rm -rf $(objtree)/arch/i386