diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-12-17 15:10:27 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-12-17 15:10:27 +0800 |
| commit | b57438e86302b9a0b175c183827bc4171552d8f9 (patch) | |
| tree | f089c8bb249d47acdad34a1b7bc87bf26934b2ad /arch/powerpc | |
| parent | 3e5fe00cd38e033796a0de2ea9928c0cb460e6b6 (diff) | |
| parent | a472efc75989c7092187fe00f0400e02c495c436 (diff) | |
Merge tag 'v3.10.63' into linux-linaro-lsk
This is the 3.10.63 stable release
Diffstat (limited to 'arch/powerpc')
| -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 |