diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2021-03-15 14:41:59 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2021-04-08 21:17:43 +1000 |
| commit | acd4dfeb49c8ec1071b1e67683c5779e97fdc5b9 (patch) | |
| tree | 74be2ad070088e6064a2303fbef70a7a1358d8f4 | |
| parent | powerpc/64: Move security code into security.c (diff) | |
| download | linux-dev-acd4dfeb49c8ec1071b1e67683c5779e97fdc5b9.tar.xz linux-dev-acd4dfeb49c8ec1071b1e67683c5779e97fdc5b9.zip | |
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 <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
| -rw-r--r-- | arch/powerpc/purgatory/trampoline_64.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/purgatory/trampoline_64.S b/arch/powerpc/purgatory/trampoline_64.S index d956b8a35fd1..b35837c13852 100644 --- a/arch/powerpc/purgatory/trampoline_64.S +++ b/arch/powerpc/purgatory/trampoline_64.S @@ -12,7 +12,6 @@ #include <asm/asm-compat.h> #include <asm/crashdump-ppc64.h> - .machine ppc64 .balign 256 .globl purgatory_start purgatory_start: |