]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
x86/boot/compressed: Don't declare __force_order in kaslr_64.c
authorH.J. Lu <hjl.tools@gmail.com>
Thu, 16 Jan 2020 20:46:51 +0000 (12:46 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Mar 2020 06:18:27 +0000 (07:18 +0100)
commitace57ef4182178b0829c64cee5d2dd55b9cb9a8e
treed5a48e6ab67b9866720bb9d183d1a22008d4de59
parent9ed80a22989164482384e4d184036b19086495a5
x86/boot/compressed: Don't declare __force_order in kaslr_64.c

[ 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 <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
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/boot/compressed/kaslr_64.c