From: Michael Ellerman Date: Mon, 15 Mar 2021 03:41:59 +0000 (+1100) Subject: powerpc/kexec: Don't use .machine ppc64 in trampoline_64.S X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=acd4dfeb49c8ec1071b1e67683c5779e97fdc5b9;p=linux.git 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 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 Signed-off-by: Michael Ellerman Reviewed-by: Segher Boessenkool Link: https://lore.kernel.org/r/20210315034159.315675-1-mpe@ellerman.id.au --- diff --git a/arch/powerpc/purgatory/trampoline_64.S b/arch/powerpc/purgatory/trampoline_64.S index d956b8a35fd13..b35837c138526 100644 --- a/arch/powerpc/purgatory/trampoline_64.S +++ b/arch/powerpc/purgatory/trampoline_64.S @@ -12,7 +12,6 @@ #include #include - .machine ppc64 .balign 256 .globl purgatory_start purgatory_start: