[tip: x86/urgent] x86/boot/compressed: Don't declare __force_order in kaslr_64.c

From: tip-bot2 for H.J. Lu
Date: Wed Feb 19 2020 - 11:32:13 EST

The following commit has been merged into the x86/urgent branch of tip:

Commit-ID: df6d4f9db79c1a5d6f48b59db35ccd1e9ff9adfc
Gitweb: https://git.kernel.org/tip/df6d4f9db79c1a5d6f48b59db35ccd1e9ff9adfc
Author: H.J. Lu <hjl.tools@xxxxxxxxx>
AuthorDate: Thu, 16 Jan 2020 12:46:51 -08:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Wed, 19 Feb 2020 17:23:59 +01:00

x86/boot/compressed: Don't declare __force_order in kaslr_64.c

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 <hjl.tools@xxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lkml.kernel.org/r/20200124181811.4780-1-hjl.tools@xxxxxxxxx
arch/x86/boot/compressed/kaslr_64.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/arch/x86/boot/compressed/kaslr_64.c b/arch/x86/boot/compressed/kaslr_64.c
index 748456c..9557c5a 100644
--- a/arch/x86/boot/compressed/kaslr_64.c
+++ b/arch/x86/boot/compressed/kaslr_64.c
@@ -29,9 +29,6 @@
#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;