powerpc/kexec: Don't use .machine ppc64 in trampoline_64.S
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 15 Mar 2021 03:41:59 +0000 (14:41 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 8 Apr 2021 11:17:43 +0000 (21:17 +1000)
As best as I can tell the ".machine" directive in trampoline_64.S is no
longer, or never was, necessary.

It was added in commit 0d97631392c2 ("powerpc: Add purgatory for
kexec_file_load() implementation."), which created the file based on
the kexec-tools purgatory. It may be/have-been necessary in the
kexec-tools version, but we have a completely different build system,
and we already pass the desired CPU flags, eg:

  gcc ... -m64 -Wl,-a64 -mabi=elfv2 -Wa,-maltivec -Wa,-mpower4 -Wa,-many
  ... arch/powerpc/purgatory/trampoline_64.S

So drop the ".machine" directive and rely on the assembler flags.

Reported-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Reviewed-by: Segher Boessenkool <segher@kernel.crashing.org>
Link: https://lore.kernel.org/r/20210315034159.315675-1-mpe@ellerman.id.au
arch/powerpc/purgatory/trampoline_64.S

index d956b8a35fd13721d3f5bd964fb578b5ae5c7e3b..b35837c138526c5a388589778af91dc142027815 100644 (file)
@@ -12,7 +12,6 @@
 #include <asm/asm-compat.h>
 #include <asm/crashdump-ppc64.h>
 
-       .machine ppc64
        .balign 256
        .globl purgatory_start
 purgatory_start: