Skip to content

Commit e5de1c7

Browse files
seghergregkh
authored andcommitted
powerpc: Convert cmp to cmpd in idle enter sequence
commit 80f23935cadb1c654e81951f5a8b7ceae0acc1b4 upstream. PowerPC's "cmp" instruction has four operands. Normally people write "cmpw" or "cmpd" for the second cmp operand 0 or 1. But, frequently people forget, and write "cmp" with just three operands. With older binutils this is silently accepted as if this was "cmpw", while often "cmpd" is wanted. With newer binutils GAS will complain about this for 64-bit code. For 32-bit code it still silently assumes "cmpw" is what is meant. In this instance the code comes directly from ISA v2.07, including the cmp, but cmpd is correct. Backport to stable so that new toolchains can build old kernels. Fixes: 948cf67 ("powerpc: Add NAP mode support on Power7 in HV mode") Reviewed-by: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com> Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent cadaba8 commit e5de1c7

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/powerpc/kernel/idle_power7.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
std r0,0(r1); \
4545
ptesync; \
4646
ld r0,0(r1); \
47-
1: cmp cr0,r0,r0; \
47+
1: cmpd cr0,r0,r0; \
4848
bne 1b; \
4949
IDLE_INST; \
5050
b .

0 commit comments

Comments
 (0)