diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 23:32:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 23:32:13 -0500 |
| commit | fe69102188cde0700cddd8d4cda0b77d68284884 (patch) | |
| tree | ae2f88c810ff48f040a808a924585000b52082e9 /arch/powerpc/kernel/fpu.S | |
| parent | f30ac319f1b91878cdc57a50930f15c36e0e103a (diff) | |
| parent | 7d4d61544a12333600bdb9b018a149868418692e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/kernel/fpu.S')
| -rw-r--r-- | arch/powerpc/kernel/fpu.S | 2 |
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) | |||
| 66 | #else | 66 | #else |
| 67 | ld r4,PACACURRENT(r13) | 67 | ld r4,PACACURRENT(r13) |
| 68 | addi r5,r4,THREAD /* Get THREAD */ | 68 | addi r5,r4,THREAD /* Get THREAD */ |
| 69 | ld r4,THREAD_FPEXC_MODE(r5) | 69 | lwz r4,THREAD_FPEXC_MODE(r5) |
| 70 | ori r12,r12,MSR_FP | 70 | ori r12,r12,MSR_FP |
| 71 | or r12,r12,r4 | 71 | or r12,r12,r4 |
| 72 | std r12,_MSR(r1) | 72 | std r12,_MSR(r1) |