summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/vector.S
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-12-08 19:45:45 +0100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-12-09 08:10:12 +0100
commite090aa80321b64c3b793f3b047e31ecf1af9538d (patch)
tree30ddd96363a873ae8203f42a063a4d2d1cd63d6b /arch/powerpc/kernel/vector.S
parentMerge commit 'origin/master' into next (diff)
downloadlinux-e090aa80321b64c3b793f3b047e31ecf1af9538d.tar.xz
linux-e090aa80321b64c3b793f3b047e31ecf1af9538d.zip
powerpc: Fix usage of 64-bit instruction in 32-bit altivec code
e821ea70f3b4873b50056a1e0f74befed1014c09 introduced a bug by copying some 64-bit originated code as-is to be used by both 32 and 64-bit but this code contains a 64-bit ony "cmpdi" instruction. This changes it to cmpwi, which is fine since VRSAVE can only contains a 32-bit value anyway. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> CC: <stable@kernel.org>
Diffstat (limited to 'arch/powerpc/kernel/vector.S')
-rw-r--r--arch/powerpc/kernel/vector.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/vector.S b/arch/powerpc/kernel/vector.S
index 67b6916f0e94..fe460482fa68 100644
--- a/arch/powerpc/kernel/vector.S
+++ b/arch/powerpc/kernel/vector.S
@@ -58,7 +58,7 @@ _GLOBAL(load_up_altivec)
* all 1's
*/
mfspr r4,SPRN_VRSAVE
- cmpdi 0,r4,0
+ cmpwi 0,r4,0
bne+ 1f
li r4,-1
mtspr SPRN_VRSAVE,r4