git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
arm
/
vfp
/
vfpmodule.c
diff --git
a/arch/arm/vfp/vfpmodule.c
b/arch/arm/vfp/vfpmodule.c
index
03486be
..
22f3da4
100644
(file)
--- a/
arch/arm/vfp/vfpmodule.c
+++ b/
arch/arm/vfp/vfpmodule.c
@@
-180,7
+180,7
@@
static u32 vfp_emulate_instruction(u32 inst, u32 fpscr, struct pt_regs *regs)
* emulate it.
*/
}
- return exceptions
& ~VFP_NAN_FLAG
;
+ return exceptions;
}
/*
@@
-245,7
+245,7
@@
void VFP9_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs)
*/
barrier();
trigger = fmrx(FPINST2);
-
orig_fpscr =
fpscr = fmrx(FPSCR);
+ fpscr = fmrx(FPSCR);
emulate:
exceptions = vfp_emulate_instruction(trigger, fpscr, regs);