Re: [PATCH 29/40] mips: Replace __get_cpu_var uses

From: David Daney
Date: Thu Dec 19 2013 - 12:46:38 EST


On 12/19/2013 07:50 AM, Christoph Lameter wrote:
[...]


Cc: Ralf Baechle<ralf@xxxxxxxxxxxxxx>
Signed-off-by: Christoph Lameter<cl@xxxxxxxxx>

Index: linux/arch/mips/include/asm/fpu_emulator.h
===================================================================
--- linux.orig/arch/mips/include/asm/fpu_emulator.h 2013-12-02 16:07:58.254398466 -0600
+++ linux/arch/mips/include/asm/fpu_emulator.h 2013-12-02 16:07:58.244398747 -0600
@@ -43,7 +43,7 @@ DECLARE_PER_CPU(struct mips_fpu_emulator
#define MIPS_FPU_EMU_INC_STATS(M) \
do { \
preempt_disable(); \
- __local_inc(&__get_cpu_var(fpuemustats).M); \
+ __this_cpu_inc(fpuemustats.M); \
preempt_enable(); \
} while (0)


Something seems to be incorrect in this bit.

I applied patches 01-16,18-23,25-29 (17 and 24 went missing)

building for arch/mips/configs/cavium_octeon_defconfig, I get:

.
.
.
CC arch/mips/math-emu/cp1emu.o
arch/mips/math-emu/cp1emu.c: In function 'cop1Emulate':
arch/mips/math-emu/cp1emu.c:957:1: error: invalid operands to binary + (have 'local_t' and 'int')
arch/mips/math-emu/cp1emu.c:957:1: error: invalid operands to binary + (have 'local_t' and 'int')
arch/mips/math-emu/cp1emu.c:957:1: error: invalid operands to binary + (have 'local_t' and 'int')
arch/mips/math-emu/cp1emu.c:957:1: error: invalid operands to binary + (have 'local_t' and 'int')
.
.
.



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/