lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 18 Feb 2020 15:07:24 -0000 From: "tip-bot2 for H.J. Lu" <tip-bot2@...utronix.de> To: linux-tip-commits@...r.kernel.org Cc: "H.J. Lu" <hjl.tools@...il.com>, Borislav Petkov <bp@...e.de>, x86 <x86@...nel.org>, LKML <linux-kernel@...r.kernel.org> Subject: [tip: x86/boot] x86/boot/compressed: Don't declare __force_order in kaslr_64.c The following commit has been merged into the x86/boot branch of tip: Commit-ID: 970b41399925e34fdf5783a53fe8cc73f04fec37 Gitweb: https://git.kernel.org/tip/970b41399925e34fdf5783a53fe8cc73f04fec37 Author: H.J. Lu <hjl.tools@...il.com> AuthorDate: Thu, 16 Jan 2020 12:46:51 -08:00 Committer: Borislav Petkov <bp@...e.de> CommitterDate: Tue, 18 Feb 2020 14:40:53 +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@...il.com> Signed-off-by: Borislav Petkov <bp@...e.de> Link: https://lkml.kernel.org/r/20200124181811.4780-1-hjl.tools@gmail.com --- 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 @@ #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;
Powered by blists - more mailing lists