diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-20 16:36:38 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-20 16:36:38 -0400 |
| commit | 75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d (patch) | |
| tree | c2f02ee30609d0d69308b4ca80d68d02a5f85552 /arch/mips/kernel/branch.c | |
| parent | 0fd1ffe0633b4b039b343b753598e6df435e034d (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/mips/kernel/branch.c')
| -rw-r--r-- | arch/mips/kernel/branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index b6232d9033cb..76fd3f22c766 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c | |||
| @@ -178,7 +178,7 @@ int __compute_return_epc(struct pt_regs *regs) | |||
| 178 | if (is_fpu_owner()) | 178 | if (is_fpu_owner()) |
| 179 | asm volatile("cfc1\t%0,$31" : "=r" (fcr31)); | 179 | asm volatile("cfc1\t%0,$31" : "=r" (fcr31)); |
| 180 | else | 180 | else |
| 181 | fcr31 = current->thread.fpu.hard.fcr31; | 181 | fcr31 = current->thread.fpu.fcr31; |
| 182 | preempt_enable(); | 182 | preempt_enable(); |
| 183 | 183 | ||
| 184 | bit = (insn.i_format.rt >> 2); | 184 | bit = (insn.i_format.rt >> 2); |