From fb3c34e1eeba2b20ab9a6296f11698784cf24904 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 25 Feb 2013 16:09:12 +0000 Subject: [PATCH] --- yaml --- r: 360621 b: refs/heads/master c: 5e4ba617c1b584b2e376f31a63bd4e734109318a h: refs/heads/master i: 360619: 26bf605c8b3bf087177285fbb61ec503c52285c9 v: v3 --- [refs] | 2 +- trunk/arch/arm/vfp/vfpmodule.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 82ca5de8bf99..449c137478ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 938f94cde74b33d6d3580c6fe65ebe918a770ae2 +refs/heads/master: 5e4ba617c1b584b2e376f31a63bd4e734109318a diff --git a/trunk/arch/arm/vfp/vfpmodule.c b/trunk/arch/arm/vfp/vfpmodule.c index 3b44e0dd0a93..5dfbb0b8e7f4 100644 --- a/trunk/arch/arm/vfp/vfpmodule.c +++ b/trunk/arch/arm/vfp/vfpmodule.c @@ -413,7 +413,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; /*