aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/purgatory
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2017-08-05 19:55:11 +0200
committerMichael Ellerman <mpe@ellerman.id.au>2017-08-10 22:29:41 +1000
commit8a583c0a8d316d8ea52ea78491174ab1a3e9ef9d (patch)
treea2db42f9b485192a4fadec7d73ba365749f6063a /arch/powerpc/purgatory
parent21a0e8c14bf61472723d2acc83f98ab35ff321b4 (diff)
powerpc: Fix invalid use of register expressions
binutils >= 2.26 now warns about misuse of register expressions in assembler operands that are actually literals, for example: arch/powerpc/kernel/entry_64.S:535: Warning: invalid register expression In practice these are almost all uses of r0 that should just be a literal 0. Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> [mpe: Mention r0 is almost always the culprit, fold in purgatory change] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/purgatory')
-rw-r--r--arch/powerpc/purgatory/trampoline.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/purgatory/trampoline.S b/arch/powerpc/purgatory/trampoline.S
index 3696ea6c4826..30277446892c 100644
--- a/arch/powerpc/purgatory/trampoline.S
+++ b/arch/powerpc/purgatory/trampoline.S
@@ -67,7 +67,7 @@ master:
mr %r16,%r3 /* save dt address in reg16 */
li %r4,20
LWZX_BE %r6,%r3,%r4 /* fetch __be32 version number at byte 20 */
- cmpwi %r0,%r6,2 /* v2 or later? */
+ cmpwi %cr0,%r6,2 /* v2 or later? */
blt 1f
li %r4,28
STWX_BE %r17,%r3,%r4 /* Store my cpu as __be32 at byte 28 */