]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitcb181320e6e3e4fb4d332c99027aac9942f00492
tree74be2ad070088e6064a2303fbef70a7a1358d8f4
parentfbb0e0231f9c5bbe8ffde6a92293afa99fc081c8
powerpc/kexec: Don't use .machine ppc64 in trampoline_64.S

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 2358c77aea1b ("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