From: Greg Kroah-Hartman Date: Tue, 10 Mar 2020 16:55:39 +0000 (+0100) Subject: drop x86-boot-compressed-don-t-declare-__force_order-in-k.patch from 4.9 X-Git-Tag: v4.4.216~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7478b4adbfc96117b066020392ea549f947cbe59;p=thirdparty%2Fkernel%2Fstable-queue.git drop x86-boot-compressed-don-t-declare-__force_order-in-k.patch from 4.9 --- diff --git a/queue-4.9/series b/queue-4.9/series index 4648f676976..ee4bb991975 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -59,7 +59,6 @@ net-ks8851-ml-fix-16-bit-data-access.patch net-ks8851-ml-fix-16-bit-io-operation.patch watchdog-da9062-do-not-ping-the-hw-during-stop.patch s390-cio-cio_ignore_proc_seq_next-should-increase-po.patch -x86-boot-compressed-don-t-declare-__force_order-in-k.patch cifs-don-t-leak-eagain-for-stat-during-reconnect.patch usb-storage-add-quirk-for-samsung-fit-flash.patch usb-quirks-add-no_lpm-quirk-for-logitech-screen-share.patch diff --git a/queue-4.9/x86-boot-compressed-don-t-declare-__force_order-in-k.patch b/queue-4.9/x86-boot-compressed-don-t-declare-__force_order-in-k.patch deleted file mode 100644 index 1d364c3ba37..00000000000 --- a/queue-4.9/x86-boot-compressed-don-t-declare-__force_order-in-k.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 7774f0458a4cc6c4600655aadf7b1d6a579a97b4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 16 Jan 2020 12:46:51 -0800 -Subject: x86/boot/compressed: Don't declare __force_order in kaslr_64.c - -From: H.J. Lu - -[ Upstream commit df6d4f9db79c1a5d6f48b59db35ccd1e9ff9adfc ] - -GCC 10 changed the default to -fno-common, which leads to - - LD arch/x86/boot/compressed/vmlinux - ld: arch/x86/boot/compressed/pgtable_64.o:(.bss+0x0): multiple definition of `__force_order'; \ - arch/x86/boot/compressed/kaslr_64.o:(.bss+0x0): first defined here - make[2]: *** [arch/x86/boot/compressed/Makefile:119: arch/x86/boot/compressed/vmlinux] Error 1 - -Since __force_order is already provided in pgtable_64.c, there is no -need to declare __force_order in kaslr_64.c. - -Signed-off-by: H.J. Lu -Signed-off-by: Borislav Petkov -Link: https://lkml.kernel.org/r/20200124181811.4780-1-hjl.tools@gmail.com -Signed-off-by: Sasha Levin ---- - arch/x86/boot/compressed/pagetable.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/arch/x86/boot/compressed/pagetable.c b/arch/x86/boot/compressed/pagetable.c -index 56589d0a804b1..2591f8f6d45f2 100644 ---- a/arch/x86/boot/compressed/pagetable.c -+++ b/arch/x86/boot/compressed/pagetable.c -@@ -25,9 +25,6 @@ - #define __PAGE_OFFSET __PAGE_OFFSET_BASE - #include "../../mm/ident_map.c" - --/* Used by pgtable.h asm code to force instruction serialization. */ --unsigned long __force_order; -- - /* Used to track our page table allocation area. */ - struct alloc_pgt_data { - unsigned char *pgt_buf; --- -2.20.1 -