projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'usb-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
[cascardo/linux.git]
/
arch
/
mips
/
kernel
/
mips-r2-to-r6-emul.c
diff --git
a/arch/mips/kernel/mips-r2-to-r6-emul.c
b/arch/mips/kernel/mips-r2-to-r6-emul.c
index
c3372ca
..
0a7e10b
100644
(file)
--- a/
arch/mips/kernel/mips-r2-to-r6-emul.c
+++ b/
arch/mips/kernel/mips-r2-to-r6-emul.c
@@
-1164,7
+1164,9
@@
fpu_emul:
regs->regs[31] = r31;
regs->cp0_epc = epc;
if (!used_math()) { /* First time FPU user. */
+ preempt_disable();
err = init_fpu();
+ preempt_enable();
set_used_math();
}
lose_fpu(1); /* Save FPU state for the emulator. */