Eric Lee / smarc-ti-linux-kernel

3
Download as
Browse Code ยป

Commit 152d44a853e42952f6c8a504fb1f8eefd21fd5fd

Authored by Anton Blanchard
Committed by Michael Ellerman
1 parent 360d88a9e3
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

powerpc: 32 bit getcpu VDSO function uses 64 bit instructions 

I used some 64 bit instructions when adding the 32 bit getcpu VDSO
function. Fix it.

Fixes: 18ad51dd342a ("powerpc: Add VDSO version of getcpu")
Cc: stable@vger.kernel.org
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

arch/powerpc/kernel/vdso32/getcpu.S
Diff comments   View file @ 152d44a
... ... @@ -30,8 +30,8 @@
30 30 V_FUNCTION_BEGIN(__kernel_getcpu)
31 31 .cfi_startproc
32 32 mfspr r5,SPRN_SPRG_VDSO_READ
33   - cmpdi cr0,r3,0
34   - cmpdi cr1,r4,0
  33 + cmpwi cr0,r3,0
  34 + cmpwi cr1,r4,0
35 35 clrlwi r6,r5,16
36 36 rlwinm r7,r5,16,31-15,31-0
37 37 beq cr0,1f