Skip to content

Commit df6d4f9

Browse files
hjl-toolssuryasaimadhu
authored andcommitted
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 <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 11a48a5 commit df6d4f9

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

arch/x86/boot/compressed/kaslr_64.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
#define __PAGE_OFFSET __PAGE_OFFSET_BASE
3030
#include "../../mm/ident_map.c"
3131

32-
/* Used by pgtable.h asm code to force instruction serialization. */
33-
unsigned long __force_order;
34-
3532
/* Used to track our page table allocation area. */
3633
struct alloc_pgt_data {
3734
unsigned char *pgt_buf;

0 commit comments

Comments
 (0)