git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' into irq-pio
[pandora-kernel.git]
/
arch
/
arm
/
vfp
/
vfpmodule.c
diff --git
a/arch/arm/vfp/vfpmodule.c
b/arch/arm/vfp/vfpmodule.c
index
22f3da4
..
37ff814
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;
+ return exceptions
& ~VFP_NAN_FLAG
;
}
/*