diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2020-01-16 12:46:51 -0800 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-02-19 17:23:59 +0100 |
| commit | df6d4f9db79c1a5d6f48b59db35ccd1e9ff9adfc (patch) | |
| tree | 1be95c62299385c56b64756c9762d24c2ef55f65 | |
| parent | 11a48a5a18c63fd7621bb050228cebf13566e4d8 (diff) | |
| download | devel-df6d4f9db79c1a5d6f48b59db35ccd1e9ff9adfc.tar.gz | |
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@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200124181811.4780-1-hjl.tools@gmail.com
| -rw-r--r-- | arch/x86/boot/compressed/kaslr_64.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/boot/compressed/kaslr_64.c b/arch/x86/boot/compressed/kaslr_64.c index 748456c365f469..9557c5a15b91e2 100644 --- a/arch/x86/boot/compressed/kaslr_64.c +++ b/arch/x86/boot/compressed/kaslr_64.c @@ -29,9 +29,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; |