aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/fpu.S
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-02-07 13:55:30 +1100
committerPaul Mackerras <paulus@samba.org>2006-02-07 13:55:30 +1100
commite2f5a3c1bec1cf3e7c76c080fd7f21476f05008a (patch)
treefb4112db5b2528b6a04fc6be9665213abc004042 /arch/powerpc/kernel/fpu.S
parentMerge ../linux-2.6 (diff)
downloadlinux-dev-e2f5a3c1bec1cf3e7c76c080fd7f21476f05008a.tar.xz
linux-dev-e2f5a3c1bec1cf3e7c76c080fd7f21476f05008a.zip
powerpc/64: Fix bug in setting floating-point exception mode
When loading up the FPU, we were using a 'ld' (load doubleword) instruction to get the FP exception mode from the thread_struct, but it's only an int field. This changes the ld to lwz (load word and zero-extend). Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/fpu.S')
-rw-r--r--arch/powerpc/kernel/fpu.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/fpu.S b/arch/powerpc/kernel/fpu.S
index e4362dfa37fb..340730fb8c91 100644
--- a/arch/powerpc/kernel/fpu.S
+++ b/arch/powerpc/kernel/fpu.S
@@ -66,7 +66,7 @@ _GLOBAL(load_up_fpu)
#else
ld r4,PACACURRENT(r13)
addi r5,r4,THREAD /* Get THREAD */
- ld r4,THREAD_FPEXC_MODE(r5)
+ lwz r4,THREAD_FPEXC_MODE(r5)
ori r12,r12,MSR_FP
or r12,r12,r4
std r12,_MSR(r1)