]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.19-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 11 Aug 2023 14:50:56 +0000 (16:50 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 11 Aug 2023 14:50:56 +0000 (16:50 +0200)
added patches:
series
sparc-fix-up-arch_cpu_finalize_init-build-breakage.patch

queue-4.19/series [new file with mode: 0644]
queue-4.19/sparc-fix-up-arch_cpu_finalize_init-build-breakage.patch [new file with mode: 0644]

diff --git a/queue-4.19/series b/queue-4.19/series
new file mode 100644 (file)
index 0000000..1104ffc
--- /dev/null
@@ -0,0 +1 @@
+sparc-fix-up-arch_cpu_finalize_init-build-breakage.patch
diff --git a/queue-4.19/sparc-fix-up-arch_cpu_finalize_init-build-breakage.patch b/queue-4.19/sparc-fix-up-arch_cpu_finalize_init-build-breakage.patch
new file mode 100644 (file)
index 0000000..ff382ff
--- /dev/null
@@ -0,0 +1,41 @@
+From foo@baz Fri Aug 11 04:46:33 PM CEST 2023
+Date: Fri, 11 Aug 2023 16:46:33 +0200
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: sparc: fix up arch_cpu_finalize_init() build breakage.
+
+In commit b698b5d11a16 ("sparc/cpu: Switch to arch_cpu_finalize_init()") the
+check for ARCH_HAS_CPU_FINALIZE_INIT was backported incorrectly to the SPARC
+config option, not SPARC32.  This causes build problems for the sparc64 arch:
+
+       sparc64-linux-ld: init/main.o: in function `start_kernel':
+       main.c:(.init.text+0x77c): undefined reference to `arch_cpu_finalize_init'
+
+Fix this up by putting the option in the correct place.
+
+Reported-by: Guenter Roeck <linux@roeck-us.net>
+Link: https://lore.kernel.org/r/252c7673-53ee-4c4b-e5ef-5bb2c0416154@roeck-us.net
+Fixes: b698b5d11a16 ("sparc/cpu: Switch to arch_cpu_finalize_init()")
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/sparc/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/sparc/Kconfig
++++ b/arch/sparc/Kconfig
+@@ -12,7 +12,6 @@ config 64BIT
+ config SPARC
+       bool
+       default y
+-      select ARCH_HAS_CPU_FINALIZE_INIT if !SMP
+       select ARCH_MIGHT_HAVE_PC_PARPORT if SPARC64 && PCI
+       select ARCH_MIGHT_HAVE_PC_SERIO
+       select OF
+@@ -51,6 +50,7 @@ config SPARC
+ config SPARC32
+       def_bool !64BIT
++      select ARCH_HAS_CPU_FINALIZE_INIT if !SMP
+       select ARCH_HAS_SYNC_DMA_FOR_CPU
+       select DMA_NONCOHERENT_OPS
+       select GENERIC_ATOMIC64