diff options
author | Nathan Scott | 2006-06-20 06:56:23 +0200 |
---|---|---|
committer | Nathan Scott | 2006-06-20 06:56:23 +0200 |
commit | 98174e46974323e4941c72e46345f7277755e146 (patch) | |
tree | c4644c8f38a519cfb3929d1175fc7107eefe48b9 /arch/mips/kernel/branch.c | |
parent | [XFS] Remove files from the build that are now unused. (diff) | |
parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
download | kernel-qcow2-linux-98174e46974323e4941c72e46345f7277755e146.tar.gz kernel-qcow2-linux-98174e46974323e4941c72e46345f7277755e146.tar.xz kernel-qcow2-linux-98174e46974323e4941c72e46345f7277755e146.zip |
Merge HEAD from ../linux-2.6
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) if (is_fpu_owner()) asm volatile("cfc1\t%0,$31" : "=r" (fcr31)); else - fcr31 = current->thread.fpu.hard.fcr31; + fcr31 = current->thread.fpu.fcr31; preempt_enable(); bit = (insn.i_format.rt >> 2); |