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>
Wed, 11 Mar 2020 17:03:00 +0000 (18:03 +0100)
commita8dc79753d727b4dbb11bb1190f90f4863046f32
tree0950a972eaf25ceaa9f59b068ec8c0aafc06dca4
parent8ea1411740a0b71b06a6eb8cf4aeeadbf540346b
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/pagetable.c