diff options
author | Christoph Lameter <cl@linux.com> | 2014-08-17 13:30:43 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-08-26 13:45:51 -0400 |
commit | d1cd39ad583e36f3a945ba043a0a2bfae83fe859 (patch) | |
tree | 0c68461dac2cede5d2e9da446d232e5ac0c7d550 | |
parent | 06b96c8beb940619ddc818e2e00915fbc524f807 (diff) |
MIPS: Replace __get_cpu_var uses in FPU emulator.
The use of __this_cpu_inc() requires a fundamental integer type, so
change the type of all the counters to unsigned long, which is the
same width they were before, but not wrapped in local_t.
Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r-- | arch/mips/include/asm/fpu_emulator.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/mips/include/asm/fpu_emulator.h b/arch/mips/include/asm/fpu_emulator.h index 0195745b4b1b..3ee347713307 100644 --- a/arch/mips/include/asm/fpu_emulator.h +++ b/arch/mips/include/asm/fpu_emulator.h | |||
@@ -33,17 +33,17 @@ | |||
33 | #ifdef CONFIG_DEBUG_FS | 33 | #ifdef CONFIG_DEBUG_FS |
34 | 34 | ||
35 | struct mips_fpu_emulator_stats { | 35 | struct mips_fpu_emulator_stats { |
36 | local_t emulated; | 36 | unsigned long emulated; |
37 | local_t loads; | 37 | unsigned long loads; |
38 | local_t stores; | 38 | unsigned long stores; |
39 | local_t cp1ops; | 39 | unsigned long cp1ops; |
40 | local_t cp1xops; | 40 | unsigned long cp1xops; |
41 | local_t errors; | 41 | unsigned long errors; |
42 | local_t ieee754_inexact; | 42 | unsigned long ieee754_inexact; |
43 | local_t ieee754_underflow; | 43 | unsigned long ieee754_underflow; |
44 | local_t ieee754_overflow; | 44 | unsigned long ieee754_overflow; |
45 | local_t ieee754_zerodiv; | 45 | unsigned long ieee754_zerodiv; |
46 | local_t ieee754_invalidop; | 46 | unsigned long ieee754_invalidop; |
47 | }; | 47 | }; |
48 | 48 | ||
49 | DECLARE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats); | 49 | DECLARE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats); |
@@ -51,7 +51,7 @@ DECLARE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats); | |||
51 | #define MIPS_FPU_EMU_INC_STATS(M) \ | 51 | #define MIPS_FPU_EMU_INC_STATS(M) \ |
52 | do { \ | 52 | do { \ |
53 | preempt_disable(); \ | 53 | preempt_disable(); \ |
54 | __local_inc(&__get_cpu_var(fpuemustats).M); \ | 54 | __this_cpu_inc(fpuemustats.M); \ |
55 | preempt_enable(); \ | 55 | preempt_enable(); \ |
56 | } while (0) | 56 | } while (0) |
57 | 57 | ||