diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-21 00:50:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-21 00:50:39 -0700 |
| commit | e04997b13a2c2fc93af970fe95fd29a74db113e8 (patch) | |
| tree | a84ec3368edc3c2568a0d6acdfa0d0e50d8cacf7 /arch/mips/include/asm/fpu_emulator.h | |
| parent | 6651ffc8e8bdd5fb4b7d1867c6cfebb4f309512c (diff) | |
| parent | 05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/mips/include/asm/fpu_emulator.h')
| -rw-r--r-- | arch/mips/include/asm/fpu_emulator.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips/include/asm/fpu_emulator.h b/arch/mips/include/asm/fpu_emulator.h index aecada6f611..3b409270556 100644 --- a/arch/mips/include/asm/fpu_emulator.h +++ b/arch/mips/include/asm/fpu_emulator.h @@ -41,7 +41,11 @@ struct mips_fpu_emulator_stats { DECLARE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats); #define MIPS_FPU_EMU_INC_STATS(M) \ - cpu_local_wrap(__local_inc(&__get_cpu_var(fpuemustats).M)) +do { \ + preempt_disable(); \ + __local_inc(&__get_cpu_var(fpuemustats).M); \ + preempt_enable(); \ +} while (0) #else #define MIPS_FPU_EMU_INC_STATS(M) do { } while (0) |