summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-12-08 18:45:45 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-18 13:43:47 -0800
commit7c52c4436288e1eec78edaca6366658b33fb54e2 (patch)
treebf5ffc9a6847d385ed6989cca75d5b6375e89a39 /arch
parent6d56cf9ae2582f7b35975368f4d2569833d20bc3 (diff)
downloadlwn-7c52c4436288e1eec78edaca6366658b33fb54e2.tar.gz
lwn-7c52c4436288e1eec78edaca6366658b33fb54e2.zip
powerpc: Fix usage of 64-bit instruction in 32-bit altivec code
commit e090aa80321b64c3b793f3b047e31ecf1af9538d upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
-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 ea4d64644d02..419f492cb586 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