diff options
| author | Anton Blanchard <anton@samba.org> | 2014-11-27 08:11:28 +1100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-16 09:34:28 -0800 |
| commit | 5dc228a54777c8a9c80bef0d376fafde76ce1d2b (patch) | |
| tree | 881522a2ec2adf13c9b14143052f1f745c335bf8 | |
| parent | 7d4a6dae27501820b234c81dc178901cddfceeda (diff) | |
| download | kernel-common-5dc228a54777c8a9c80bef0d376fafde76ce1d2b.tar.gz kernel-common-5dc228a54777c8a9c80bef0d376fafde76ce1d2b.tar.bz2 kernel-common-5dc228a54777c8a9c80bef0d376fafde76ce1d2b.zip | |
powerpc: 32 bit getcpu VDSO function uses 64 bit instructions
commit 152d44a853e42952f6c8a504fb1f8eefd21fd5fd upstream.
I used some 64 bit instructions when adding the 32 bit getcpu VDSO
function. Fix it.
Fixes: 18ad51dd342a ("powerpc: Add VDSO version of getcpu")
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/powerpc/kernel/vdso32/getcpu.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/vdso32/getcpu.S b/arch/powerpc/kernel/vdso32/getcpu.S index 47afd08c90f7..fe7e97a1aad9 100644 --- a/arch/powerpc/kernel/vdso32/getcpu.S +++ b/arch/powerpc/kernel/vdso32/getcpu.S @@ -30,8 +30,8 @@ V_FUNCTION_BEGIN(__kernel_getcpu) .cfi_startproc mfspr r5,SPRN_USPRG3 - cmpdi cr0,r3,0 - cmpdi cr1,r4,0 + cmpwi cr0,r3,0 + cmpwi cr1,r4,0 clrlwi r6,r5,16 rlwinm r7,r5,16,31-15,31-0 beq cr0,1f |