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
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
arm
/
vfp
/
vfpsingle.c
diff --git
a/arch/arm/vfp/vfpsingle.c
b/arch/arm/vfp/vfpsingle.c
index
92aa841
..
6849fe3
100644
(file)
--- a/
arch/arm/vfp/vfpsingle.c
+++ b/
arch/arm/vfp/vfpsingle.c
@@
-31,7
+31,7
@@
* ===========================================================================
*/
#include <linux/kernel.h>
* ===========================================================================
*/
#include <linux/kernel.h>
-#include <
asm
/bitops.h>
+#include <
linux
/bitops.h>
#include <asm/ptrace.h>
#include <asm/vfp.h>
#include <asm/ptrace.h>
#include <asm/vfp.h>
@@
-201,7
+201,7
@@
u32 vfp_single_normaliseround(int sd, struct vfp_single *vs, u32 fpscr, u32 exce
vfp_put_float(sd, d);
}
vfp_put_float(sd, d);
}
- return exceptions;
+ return exceptions
& ~VFP_NAN_FLAG
;
}
/*
}
/*
@@
-246,7
+246,7
@@
vfp_propagate_nan(struct vfp_single *vsd, struct vfp_single *vsn,
/*
* If one was a signalling NAN, raise invalid operation.
*/
/*
* If one was a signalling NAN, raise invalid operation.
*/
- return tn == VFP_SNAN || tm == VFP_SNAN ? FPSCR_IOC :
0x100
;
+ return tn == VFP_SNAN || tm == VFP_SNAN ? FPSCR_IOC :
VFP_NAN_FLAG
;
}
}