tree 64ebf6449d656ccc95b64a229034ffca76278ff1
parent 662b43ae056b43b35564a4cabfa7a77560e794c8
author H.J. Lu <hjl.tools@gmail.com> 1579207611 -0800
committer David Greenaway <dgreenaway@google.com> 1619587275 +1000

[x86_64] Cherrypick gcc-10 fix.

Cherry-pick the upstream commit df6d4f9db79c1a5d6f48b59db35ccd1e9ff9adfc
allowing the build to succeed on gcc 10.

    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

Change-Id: I913cd40729d9633c1f71f3b71af3cc45fbc7606c