summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2010-03-08 19:38:13 +0100
committerRalf Baechle <ralf@linux-mips.org>2010-04-12 18:26:08 +0200
commitc948aca4f49d94b08c425f65acdaca1d679d6fa7 (patch)
tree67bd7e0857b1cfdd1d1af1431daafb730decf9dc /arch
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff)
downloadlinux-c948aca4f49d94b08c425f65acdaca1d679d6fa7.tar.xz
linux-c948aca4f49d94b08c425f65acdaca1d679d6fa7.zip
MIPS: Fix build breakage if CONFIG_DEBUG_FS is enabled.
Caused by 38b7827fcdd660f591d645bd3ae6644456a4773c - no, cpu_local_* was not unused. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Cc: Christoph Lameter <cl@linux-foundation.org> Acked-by: David Daney <ddaney@caviumnetworks.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/include/asm/fpu_emulator.h6
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 aecada6f6117..3b4092705567 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)