Skip to content

Commit

Permalink
powerpc: 32 bit getcpu VDSO function uses 64 bit instructions
Browse files Browse the repository at this point in the history
commit 152d44a upstream.

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

Fixes: 18ad51d ("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>
  • Loading branch information
Anton Blanchard authored and Greg Kroah-Hartman committed Dec 16, 2014
1 parent 7f45ce8 commit 4088246
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/powerpc/kernel/vdso32/getcpu.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4088246

Please sign in to comment.