aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/vfp
diff options
context:
space:
mode:
authorPawit Pornkitprasan <p.pawit@gmail.com>2013-03-21 14:02:44 +0700
committerPawit Pornkitprasan <p.pawit@gmail.com>2013-03-21 14:03:15 +0700
commit99fed99a60000dcf75842a88103bfb513511cdd8 (patch)
tree3daa2950331a080c0292916a63e6b6e0056a365e /arch/arm/vfp
parentcdf733ed16cf85e9d89ed45f0eceb060f77955fd (diff)
parentef4fb40e21750ad9c3d1b017c61a9a69701039ff (diff)
downloadkernel_samsung_aries-99fed99a60000dcf75842a88103bfb513511cdd8.zip
kernel_samsung_aries-99fed99a60000dcf75842a88103bfb513511cdd8.tar.gz
kernel_samsung_aries-99fed99a60000dcf75842a88103bfb513511cdd8.tar.bz2
Merge 3.0.70
Change-Id: I4316261b071ad622fcf62dcae7874c2ea6d9604d
Diffstat (limited to 'arch/arm/vfp')
-rw-r--r--arch/arm/vfp/vfpmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index 192e9dd..5d28ab7 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -375,7 +375,7 @@ void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs)
* If there isn't a second FP instruction, exit now. Note that
* the FPEXC.FP2V bit is valid only if FPEXC.EX is 1.
*/
- if (fpexc ^ (FPEXC_EX | FPEXC_FP2V))
+ if ((fpexc & (FPEXC_EX | FPEXC_FP2V)) != (FPEXC_EX | FPEXC_FP2V))
goto exit;
/*