From 51992afad7955745bb4c13660a2b3993031e9caa Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 19 Dec 2018 19:23:50 +0100 Subject: [PATCH] drop 4.19 patch that was in last release --- queue-4.19/series | 1 - ...mpiler-support-check-for-config_retp.patch | 68 ------------------- 2 files changed, 69 deletions(-) delete mode 100644 queue-4.19/x86-build-fix-compiler-support-check-for-config_retp.patch diff --git a/queue-4.19/series b/queue-4.19/series index fc9b4678de1..24ef612f9a0 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -51,7 +51,6 @@ ethernet-fman-fix-wrong-of_node_put-in-probe-functio.patch thermal-armada-fix-legacy-validity-test-sense.patch net-mvpp2-fix-detection-of-10g-sfp-modules.patch net-mvpp2-fix-phylink-handling-of-invalid-phy-modes.patch -x86-build-fix-compiler-support-check-for-config_retp.patch drm-amdgpu-vcn-update-vcn.cur_state-during-suspend.patch tools-testing-nvdimm-align-test-resources-to-128m.patch acpi-nfit-fix-user-initiated-ars-to-be-ars-long-rath.patch diff --git a/queue-4.19/x86-build-fix-compiler-support-check-for-config_retp.patch b/queue-4.19/x86-build-fix-compiler-support-check-for-config_retp.patch deleted file mode 100644 index 4d2b776bc29..00000000000 --- a/queue-4.19/x86-build-fix-compiler-support-check-for-config_retp.patch +++ /dev/null @@ -1,68 +0,0 @@ -From fe7443c2e9788ea18a4174995385c603a7835671 Mon Sep 17 00:00:00 2001 -From: Masahiro Yamada -Date: Wed, 5 Dec 2018 15:27:19 +0900 -Subject: x86/build: Fix compiler support check for CONFIG_RETPOLINE - -[ Upstream commit 25896d073d8a0403b07e6dec56f58e6c33678207 ] - -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 -Tested-by: Meelis Roos -Signed-off-by: Masahiro Yamada -Acked-by: Zhenzhong Duan -Cc: Borislav Petkov -Cc: Linus Torvalds -Cc: Peter Zijlstra -Cc: Thomas Gleixner -Cc: Zhenzhong Duan -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 -Signed-off-by: Sasha Levin ---- - arch/x86/Makefile | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/arch/x86/Makefile b/arch/x86/Makefile -index 9298f0f3817a..b84f61bc5e7a 100644 ---- a/arch/x86/Makefile -+++ b/arch/x86/Makefile -@@ -223,9 +223,6 @@ KBUILD_CFLAGS += -fno-asynchronous-unwind-tables - - # 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 --- -2.19.1 - -- 2.47.3