| From 152d44a853e42952f6c8a504fb1f8eefd21fd5fd Mon Sep 17 00:00:00 2001 |
| From: Anton Blanchard <anton@samba.org> |
| Date: Thu, 27 Nov 2014 08:11:28 +1100 |
| Subject: powerpc: 32 bit getcpu VDSO function uses 64 bit instructions |
| |
| From: Anton Blanchard <anton@samba.org> |
| |
| 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> |
| |
| --- |
| arch/powerpc/kernel/vdso32/getcpu.S | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- 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_SPRG_VDSO_READ |
| - 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 |
