diff options
| author | Anton Blanchard <anton@samba.org> | 2014-11-27 08:11:28 +1100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-01-07 16:20:16 +0100 |
| commit | 96c357037c54fd77a729ec7370c6a80dd477e844 (patch) | |
| tree | a6d4de7bfde944a16c3e2c3d60e061b73e66c056 | |
| parent | aa63bf3db43a2722d8706733af71ac3642b1e804 (diff) | |
| download | linux-stable-96c357037c54fd77a729ec7370c6a80dd477e844.tar.gz linux-stable-96c357037c54fd77a729ec7370c6a80dd477e844.tar.bz2 linux-stable-96c357037c54fd77a729ec7370c6a80dd477e844.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: Jiri Slaby <jslaby@suse.cz>
| -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 |