From: Greg Kroah-Hartman Date: Wed, 8 Mar 2023 09:14:14 +0000 (+0100) Subject: dropped powerpc patch from 6.1 and 6.2 X-Git-Tag: v6.2.3~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=69c844cdc1fa657d393a5a5c249ca0358a162ec3;p=thirdparty%2Fkernel%2Fstable-queue.git dropped powerpc patch from 6.1 and 6.2 --- diff --git a/queue-6.1/powerpc-boot-don-t-always-pass-mcpu-powerpc-when-building-32-bit-uimage.patch b/queue-6.1/powerpc-boot-don-t-always-pass-mcpu-powerpc-when-building-32-bit-uimage.patch deleted file mode 100644 index 764cafaf1e6..00000000000 --- a/queue-6.1/powerpc-boot-don-t-always-pass-mcpu-powerpc-when-building-32-bit-uimage.patch +++ /dev/null @@ -1,67 +0,0 @@ -From ff7c76f66d8bad4e694c264c789249e1d3a8205d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pali=20Roh=C3=A1r?= -Date: Wed, 25 Jan 2023 08:39:00 +0100 -Subject: powerpc/boot: Don't always pass -mcpu=powerpc when building 32-bit uImage -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -commit ff7c76f66d8bad4e694c264c789249e1d3a8205d upstream. - -When CONFIG_TARGET_CPU is specified then pass its value to the compiler --mcpu option. This fixes following build error when building kernel with -powerpc e500 SPE capable cross compilers: - - BOOTAS arch/powerpc/boot/crt0.o - powerpc-linux-gnuspe-gcc: error: unrecognized argument in option ‘-mcpu=powerpc’ - powerpc-linux-gnuspe-gcc: note: valid arguments to ‘-mcpu=’ are: 8540 8548 native - make[1]: *** [arch/powerpc/boot/Makefile:231: arch/powerpc/boot/crt0.o] Error 1 - -Similar change was already introduced for the main powerpc Makefile in -commit 446cda1b21d9 ("powerpc/32: Don't always pass -mcpu=powerpc to the -compiler"). - -Fixes: 40a75584e526 ("powerpc/boot: Build wrapper for an appropriate CPU") -Cc: stable@vger.kernel.org # v5.19+ -Signed-off-by: Pali Rohár -Signed-off-by: Christophe Leroy -Signed-off-by: Michael Ellerman -Link: https://lore.kernel.org/r/2ae3ae5887babfdacc34435bff0944b3f336100a.1674632329.git.christophe.leroy@csgroup.eu -Signed-off-by: Greg Kroah-Hartman ---- - arch/powerpc/boot/Makefile | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile -index d32d95aea5d6..295f76df13b5 100644 ---- a/arch/powerpc/boot/Makefile -+++ b/arch/powerpc/boot/Makefile -@@ -39,13 +39,19 @@ BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ - $(LINUXINCLUDE) - - ifdef CONFIG_PPC64_BOOT_WRAPPER --ifdef CONFIG_CPU_LITTLE_ENDIAN --BOOTCFLAGS += -m64 -mcpu=powerpc64le -+BOOTCFLAGS += -m64 - else --BOOTCFLAGS += -m64 -mcpu=powerpc64 -+BOOTCFLAGS += -m32 - endif -+ -+ifdef CONFIG_TARGET_CPU_BOOL -+BOOTCFLAGS += -mcpu=$(CONFIG_TARGET_CPU) -+else ifdef CONFIG_PPC64_BOOT_WRAPPER -+ifdef CONFIG_CPU_LITTLE_ENDIAN -+BOOTCFLAGS += -mcpu=powerpc64le - else --BOOTCFLAGS += -m32 -mcpu=powerpc -+BOOTCFLAGS += -mcpu=powerpc64 -+endif - endif - - BOOTCFLAGS += -isystem $(shell $(BOOTCC) -print-file-name=include) --- -2.39.2 - diff --git a/queue-6.1/series b/queue-6.1/series index 6a6a3d74ca7..b6c5171737b 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -743,7 +743,6 @@ brd-return-0-error-from-brd_insert_page.patch brd-check-for-req_nowait-and-set-correct-page-allocation-mask.patch ima-fix-error-handling-logic-when-file-measurement-failed.patch ima-align-ima_file_mmap-parameters-with-mmap_file-lsm-hook.patch -powerpc-boot-don-t-always-pass-mcpu-powerpc-when-building-32-bit-uimage.patch selftests-powerpc-fix-incorrect-kernel-headers-search-path.patch selftests-ftrace-fix-eprobe-syntax-test-case-to-check-filter-support.patch selftests-sched-fix-incorrect-kernel-headers-search-path.patch diff --git a/queue-6.2/powerpc-boot-don-t-always-pass-mcpu-powerpc-when-building-32-bit-uimage.patch b/queue-6.2/powerpc-boot-don-t-always-pass-mcpu-powerpc-when-building-32-bit-uimage.patch deleted file mode 100644 index a91a141db53..00000000000 --- a/queue-6.2/powerpc-boot-don-t-always-pass-mcpu-powerpc-when-building-32-bit-uimage.patch +++ /dev/null @@ -1,62 +0,0 @@ -From ff7c76f66d8bad4e694c264c789249e1d3a8205d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pali=20Roh=C3=A1r?= -Date: Wed, 25 Jan 2023 08:39:00 +0100 -Subject: powerpc/boot: Don't always pass -mcpu=powerpc when building 32-bit uImage -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -commit ff7c76f66d8bad4e694c264c789249e1d3a8205d upstream. - -When CONFIG_TARGET_CPU is specified then pass its value to the compiler --mcpu option. This fixes following build error when building kernel with -powerpc e500 SPE capable cross compilers: - - BOOTAS arch/powerpc/boot/crt0.o - powerpc-linux-gnuspe-gcc: error: unrecognized argument in option ‘-mcpu=powerpc’ - powerpc-linux-gnuspe-gcc: note: valid arguments to ‘-mcpu=’ are: 8540 8548 native - make[1]: *** [arch/powerpc/boot/Makefile:231: arch/powerpc/boot/crt0.o] Error 1 - -Similar change was already introduced for the main powerpc Makefile in -commit 446cda1b21d9 ("powerpc/32: Don't always pass -mcpu=powerpc to the -compiler"). - -Fixes: 40a75584e526 ("powerpc/boot: Build wrapper for an appropriate CPU") -Cc: stable@vger.kernel.org # v5.19+ -Signed-off-by: Pali Rohár -Signed-off-by: Christophe Leroy -Signed-off-by: Michael Ellerman -Link: https://lore.kernel.org/r/2ae3ae5887babfdacc34435bff0944b3f336100a.1674632329.git.christophe.leroy@csgroup.eu -Signed-off-by: Greg Kroah-Hartman ---- - arch/powerpc/boot/Makefile | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - ---- a/arch/powerpc/boot/Makefile -+++ b/arch/powerpc/boot/Makefile -@@ -39,13 +39,19 @@ BOOTCFLAGS := -Wall -Wundef -Wstrict- - $(LINUXINCLUDE) - - ifdef CONFIG_PPC64_BOOT_WRAPPER --ifdef CONFIG_CPU_LITTLE_ENDIAN --BOOTCFLAGS += -m64 -mcpu=powerpc64le -+BOOTCFLAGS += -m64 - else --BOOTCFLAGS += -m64 -mcpu=powerpc64 -+BOOTCFLAGS += -m32 - endif -+ -+ifdef CONFIG_TARGET_CPU_BOOL -+BOOTCFLAGS += -mcpu=$(CONFIG_TARGET_CPU) -+else ifdef CONFIG_PPC64_BOOT_WRAPPER -+ifdef CONFIG_CPU_LITTLE_ENDIAN -+BOOTCFLAGS += -mcpu=powerpc64le - else --BOOTCFLAGS += -m32 -mcpu=powerpc -+BOOTCFLAGS += -mcpu=powerpc64 -+endif - endif - - BOOTCFLAGS += -isystem $(shell $(BOOTCC) -print-file-name=include) diff --git a/queue-6.2/series b/queue-6.2/series index 7901589eccd..965552fc675 100644 --- a/queue-6.2/series +++ b/queue-6.2/series @@ -849,7 +849,6 @@ brd-return-0-error-from-brd_insert_page.patch brd-check-for-req_nowait-and-set-correct-page-allocation-mask.patch ima-fix-error-handling-logic-when-file-measurement-failed.patch ima-align-ima_file_mmap-parameters-with-mmap_file-lsm-hook.patch -powerpc-boot-don-t-always-pass-mcpu-powerpc-when-building-32-bit-uimage.patch selftests-powerpc-fix-incorrect-kernel-headers-search-path.patch selftests-ftrace-fix-eprobe-syntax-test-case-to-check-filter-support.patch selftests-sched-fix-incorrect-kernel-headers-search-path.patch