diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-03-24 10:26:10 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-03-24 10:26:10 +1100 |
| commit | cd427485357c0c4b99f69719251baacf25946e11 (patch) | |
| tree | ca1ff7eb2277dec42f1e20adc0b98c3c215ecfbe /arch/powerpc/kernel/vdso32/getcpu.S | |
| parent | d410ae2126481a74bc5be4a6242c4a232c19a984 (diff) | |
| parent | 48b16180d0d91324e5d2423c6d53d97bbe3dcc14 (diff) | |
| download | blackbird-op-linux-cd427485357c0c4b99f69719251baacf25946e11.tar.gz blackbird-op-linux-cd427485357c0c4b99f69719251baacf25946e11.zip | |
Merge remote-tracking branch 'scott/next' into next
Freescale updates from Scott. Mostly support for critical
and machine check exceptions on 64-bit BookE, some new
PCI suspend/resume work and misc bits.
Diffstat (limited to 'arch/powerpc/kernel/vdso32/getcpu.S')
| -rw-r--r-- | arch/powerpc/kernel/vdso32/getcpu.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/vdso32/getcpu.S b/arch/powerpc/kernel/vdso32/getcpu.S index 47afd08c90f7..23eb9a9441bd 100644 --- a/arch/powerpc/kernel/vdso32/getcpu.S +++ b/arch/powerpc/kernel/vdso32/getcpu.S @@ -29,7 +29,7 @@ */ V_FUNCTION_BEGIN(__kernel_getcpu) .cfi_startproc - mfspr r5,SPRN_USPRG3 + mfspr r5,SPRN_SPRG_VDSO_READ cmpdi cr0,r3,0 cmpdi cr1,r4,0 clrlwi r6,r5,16 |
