Fixes for 5.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.4/init-kconfig-fix-cc_has_asm_goto_tied_output-test-wi.patch b/queue-5.4/init-kconfig-fix-cc_has_asm_goto_tied_output-test-wi.patch
new file mode 100644 (file)
index 0000000..99993de
--- /dev/null
+++ b/queue-5.4/init-kconfig-fix-cc_has_asm_goto_tied_output-test-wi.patch
@@ -0,0 +1,50 @@
+From 536ee4c3ef008ea6e14a5935c6f85a95ea92418f Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 15 Nov 2022 12:01:58 +0100
+Subject: init/Kconfig: fix CC_HAS_ASM_GOTO_TIED_OUTPUT test with dash
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Alexandre Belloni <alexandre.belloni@bootlin.com>
+
+[ Upstream commit 534bd70374d646f17e2cebe0e6e4cdd478ce4f0c ]
+
+When using dash as /bin/sh, the CC_HAS_ASM_GOTO_TIED_OUTPUT test fails
+with a syntax error which is not the one we are looking for:
+
+<stdin>: In function ‘foo’:
+<stdin>:1:29: warning: missing terminating " character
+<stdin>:1:29: error: missing terminating " character
+<stdin>:2:5: error: expected ‘:’ before ‘+’ token
+<stdin>:2:7: warning: missing terminating " character
+<stdin>:2:7: error: missing terminating " character
+<stdin>:2:5: error: expected declaration or statement at end of input
+
+Removing '\n' solves this.
+
+Fixes: 1aa0e8b144b6 ("Kconfig: Add option for asm goto w/ tied outputs to workaround clang-13 bug")
+Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
+Reviewed-by: Sean Christopherson <seanjc@google.com>
+Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ init/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/init/Kconfig b/init/Kconfig
+index 74f44b753d61..f641518f4ac5 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -36,7 +36,7 @@ config CC_HAS_ASM_GOTO
+ config CC_HAS_ASM_GOTO_TIED_OUTPUT
+       depends on CC_HAS_ASM_GOTO_OUTPUT
+       # Detect buggy gcc and clang, fixed in gcc-11 clang-14.
+-      def_bool $(success,echo 'int foo(int *x) { asm goto (".long (%l[bar]) - .\n": "+m"(*x) ::: bar); return *x; bar: return 0; }' | $CC -x c - -c -o /dev/null)
++      def_bool $(success,echo 'int foo(int *x) { asm goto (".long (%l[bar]) - .": "+m"(*x) ::: bar); return *x; bar: return 0; }' | $CC -x c - -c -o /dev/null)
+ 
+ config CC_HAS_ASM_GOTO_OUTPUT
+       depends on CC_HAS_ASM_GOTO
+-- 
+2.35.1
+

diff --git a/queue-5.4/nios2-add-force-for-vmlinuz.gz.patch b/queue-5.4/nios2-add-force-for-vmlinuz.gz.patch
new file mode 100644 (file)
index 0000000..1e22972
--- /dev/null
+++ b/queue-5.4/nios2-add-force-for-vmlinuz.gz.patch
@@ -0,0 +1,37 @@
+From 467ae7ee9cc25d16f51ca5e350d9401a79c31be8 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 23 Nov 2022 19:20:53 -0800
+Subject: nios2: add FORCE for vmlinuz.gz
+
+From: Randy Dunlap <rdunlap@infradead.org>
+
+[ Upstream commit 869e4ae4cd2a23d625aaa14ae62dbebf768cb77d ]
+
+Add FORCE to placate a warning from make:
+
+arch/nios2/boot/Makefile:24: FORCE prerequisite is missing
+
+Fixes: 2fc8483fdcde ("nios2: Build infrastructure")
+Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
+Reviewed-by: Masahiro Yamada <masahiroy@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/nios2/boot/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/nios2/boot/Makefile b/arch/nios2/boot/Makefile
+index 37dfc7e584bc..0b704c1f379f 100644
+--- a/arch/nios2/boot/Makefile
++++ b/arch/nios2/boot/Makefile
+@@ -20,7 +20,7 @@ $(obj)/vmlinux.bin: vmlinux FORCE
+ $(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE
+       $(call if_changed,gzip)
+ 
+-$(obj)/vmImage: $(obj)/vmlinux.gz
++$(obj)/vmImage: $(obj)/vmlinux.gz FORCE
+       $(call if_changed,uimage)
+       @$(kecho) 'Kernel: $@ is ready'
+ 
+-- 
+2.35.1
+

diff --git a/queue-5.4/series b/queue-5.4/series
index cd4a1ed3145a50f096daf298f77dad03e3427fe0..c2a1be92289558b2ee87e4b125af32f0032f5a36 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -42,3 +42,5 @@ nfc-st-nci-fix-memory-leaks-in-evt_transaction.patch
 net-thunderx-fix-the-acpi-memory-leak.patch
 s390-crashdump-fix-tod-programmable-field-size.patch
 lib-vdso-use-grep-e-instead-of-egrep.patch
+init-kconfig-fix-cc_has_asm_goto_tied_output-test-wi.patch
+nios2-add-force-for-vmlinuz.gz.patch