summaryrefslogtreecommitdiffstats
path: root/arch/arm/vfp/vfpsingle.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-04-25 20:41:27 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-04-25 20:41:27 +0100
commit928bd1b4709045355fad8bf858904884c0a1e87f (patch)
tree1875af1016e3057fd25fa7441877f8a0b97cffbe /arch/arm/vfp/vfpsingle.c
parentc7fd84424f919740880d989cb0459c332da96013 (diff)
downloadop-kernel-dev-928bd1b4709045355fad8bf858904884c0a1e87f.zip
op-kernel-dev-928bd1b4709045355fad8bf858904884c0a1e87f.tar.gz
[ARM] vfp: fix leak of VFP_NAN_FLAG into FPSCR
The VFP code can leak VFP_NAN_FLAG into the FPSCR. It doesn't correspond to any real FPSCR bit (and overlaps one of the exception flags). Bug report from Daniel Jacobowitz Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/vfp/vfpsingle.c')
-rw-r--r--arch/arm/vfp/vfpsingle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/vfp/vfpsingle.c b/arch/arm/vfp/vfpsingle.c
index 4ac27f1..dae2c2f 100644
--- 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;
}
/*
OpenPOWER on IntegriCloud