aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/kernel/unaligned.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-09-18 10:49:28 -0700
committerMark Brown <broonie@kernel.org>2014-09-18 10:49:28 -0700
commitd831fd1b46d04e5c8c8a0431c321578d25852695 (patch)
tree53a685712d0f0debe66de80c1f0a5e545d0de7e2 /arch/mips/kernel/unaligned.c
parentc95c4e2a6bb8d44f9a8f59eadd99a9a615c53112 (diff)
parent339f8f37f0203884332585e38c06536c8477d475 (diff)
Merge tag 'v3.10.55' into linux-linaro-lsklsk-v3.10-14.09
This is the 3.10.55 stable release
Diffstat (limited to 'arch/mips/kernel/unaligned.c')
-rw-r--r--arch/mips/kernel/unaligned.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index 203d8857070d..2c81265bcf46 100644
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -604,7 +604,6 @@ static void emulate_load_store_insn(struct pt_regs *regs,
case sdc1_op:
die_if_kernel("Unaligned FP access in kernel code", regs);
BUG_ON(!used_math());
- BUG_ON(!is_fpu_owner());
lose_fpu(1); /* Save FPU state for the emulator. */
res = fpu_emulator_cop1Handler(regs, &current->thread.fpu, 1,