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 git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
[pandora-kernel.git]
/
arch
/
arm
/
vfp
/
vfpsingle.c
diff --git
a/arch/arm/vfp/vfpsingle.c
b/arch/arm/vfp/vfpsingle.c
index
4ac27f1
..
dae2c2f
100644
(file)
--- a/
arch/arm/vfp/vfpsingle.c
+++ b/
arch/arm/vfp/vfpsingle.c
@@
-203,7
+203,7
@@
u32 vfp_single_normaliseround(int sd, struct vfp_single *vs, u32 fpscr, u32 exce
vfp_put_float(sd, d);
}
- return exceptions
& ~VFP_NAN_FLAG
;
+ return exceptions;
}
/*