MIPS: Fix compile error implicit declaration of function cpu_local_wrap
PATCH 1/1 MIPS: Fix compile error implicit declaration of function cpu_local_wrap
The commit 38b7827fc removed cpu_local_xx macros that lead to a compile error: implicit declaration of function 'cpu_local_wrap', when compiled for the MIPS Cavium Octeon processors. Revert back to old code.
--- arch/mips/include/asm/local.h | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-)
arch/mips/include/asm/local.h +25 -0
@@ -193,4 +193,29 @@ static __inline__ long local_sub_return(long i, local_t * l)#define __local_add (i, l) ((l)->a.counter+=(i))#define __local_sub (i, l) ((l)->a.counter-=(i)) +/* Need to disable preemption for the cpu local counters otherwise we could +still access a variable of a previous CPU in a non atomic way. */ +#define cpu_local_wrap_v (l) \ + ({ local_t res__; \ + preempt_disable(); \ + res__ = (l); \ + preempt_enable(); \ + res__; }) +#define cpu_local_wrap (l) \ + ({ preempt_disable(); \ + l; \ + preempt_enable(); }) \ + +#define cpu_local_read (l) cpu_local_wrap_v(local_read(&__get_cpu_var(l))) +#define cpu_local_set (l, i) cpu_local_wrap(local_set(&__get_cpu_var(l), (i))) +#define cpu_local_inc (l) cpu_local_wrap(local_inc(&__get_cpu_var(l))) +#define cpu_local_dec (l) cpu_local_wrap(local_dec(&__get_cpu_var(l))) +#define cpu_local_add (i, l) cpu_local_wrap(local_add((i), &__get_cpu_var(l))) +#define cpu_local_sub (i, l) cpu_local_wrap(local_sub((i), &__get_cpu_var(l))) + +#define __cpu_local_inc (l) cpu_local_inc(l) +#define __cpu_local_dec (l) cpu_local_dec(l) +#define __cpu_local_add (i, l) cpu_local_add((i), (l)) +#define __cpu_local_sub (i, l) cpu_local_sub((i), (l)) +#endif /* _ARCH_MIPS_LOCAL_H */
Signature · 1 line
1.6.3.3.311.g7ec7
Quoted 9 lines · Philby John
The commit
38b7827fcremovedcpu_local_xxmacros that lead to a compile error: implicit declaration of function 'cpu_local_wrap', when compiled for the MIPS Cavium Octeon processors. Revert back to old code.CC Christoph Lameter<[email protected]>CC Tejun Heo<[email protected]>CC David Daney<[email protected]>Signed-off-by Philby John<[email protected]>
Ralf is testing a different patch for this problem.
David Daney
Quoted 38 lines
--- arch/mips/include/asm/local.h | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-)arch/mips/include/asm/local.h +25
-0@@ -193,4 +193,29 @@ static __inline__ long local_sub_return(long i, local_t * l)#define __local_add (i, l) ((l)->a.counter+=(i))#define __local_sub (i, l) ((l)->a.counter-=(i)) +/* Need to disable preemption for the cpu local counters otherwise we could +still access a variable of a previous CPU in a non atomic way. */ +#define cpu_local_wrap_v (l) \ + ({ local_t res__; \ + preempt_disable(); \ + res__ = (l); \ + preempt_enable(); \ + res__; }) +#define cpu_local_wrap (l) \ + ({ preempt_disable(); \ + l; \ + preempt_enable(); }) \ + +#define cpu_local_read (l) cpu_local_wrap_v(local_read(&__get_cpu_var(l))) +#define cpu_local_set (l, i) cpu_local_wrap(local_set(&__get_cpu_var(l), (i))) +#define cpu_local_inc (l) cpu_local_wrap(local_inc(&__get_cpu_var(l))) +#define cpu_local_dec (l) cpu_local_wrap(local_dec(&__get_cpu_var(l))) +#define cpu_local_add (i, l) cpu_local_wrap(local_add((i),&__get_cpu_var(l))) +#define cpu_local_sub (i, l) cpu_local_wrap(local_sub((i),&__get_cpu_var(l))) + +#define __cpu_local_inc (l) cpu_local_inc(l) +#define __cpu_local_dec (l) cpu_local_dec(l) +#define __cpu_local_add (i, l) cpu_local_add((i), (l)) +#define __cpu_local_sub (i, l) cpu_local_sub((i), (l)) +#endif /* _ARCH_MIPS_LOCAL_H */
Quoted 6 lines · David Daney
Quoted 5 lines · Philby John
The commit
38b7827fcremovedcpu_local_xxmacros that lead to a compile error: implicit declaration of function 'cpu_local_wrap', when compiled for the MIPS Cavium Octeon processors. Revert back to old code.
Quoted 6 lines
Quoted 4 lines
CC Christoph Lameter<[email protected]>CC Tejun Heo<[email protected]>CC David Daney<[email protected]>Signed-off-by Philby John<[email protected]>Ralf is testing a different patch for this problem.
Already applied to the lmo tree a few days ago so NACK for the posted patch.
Ralf
Please fix up the mips code!
Sample fix here.
--- arch/mips/include/asm/fpu_emulator.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/include/asm/fpu_emulator.h +1 -1
@@ -41,7 +41,7 @@ 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)) + local_inc(&__get_cpu_var(fpuemustats).M)#else #define MIPS_FPU_EMU_INC_STATS (M ) do { } while (0)
Quoted 48 lines · Philby John
The commit
38b7827fcremovedcpu_local_xxmacros that lead to a compile error: implicit declaration of function 'cpu_local_wrap', when compiled for the MIPS Cavium Octeon processors. Revert back to old code.CC Christoph Lameter <[email protected]>CC Tejun Heo <[email protected]>CC David Daney <[email protected]>Signed-off-by Philby John <[email protected]>--- arch/mips/include/asm/local.h | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-)arch/mips/include/asm/local.h +25
-0@@ -193,4 +193,29 @@ static __inline__ long local_sub_return(long i, local_t * l)#define __local_add (i, l) ((l)->a.counter+=(i))#define __local_sub (i, l) ((l)->a.counter-=(i)) +/* Need to disable preemption for the cpu local counters otherwise we could +still access a variable of a previous CPU in a non atomic way. */ +#define cpu_local_wrap_v (l) \ + ({ local_t res__; \ + preempt_disable(); \ + res__ = (l); \ + preempt_enable(); \ + res__; }) +#define cpu_local_wrap (l) \ + ({ preempt_disable(); \ + l; \ + preempt_enable(); }) \ + +#define cpu_local_read (l) cpu_local_wrap_v(local_read(&__get_cpu_var(l))) +#define cpu_local_set (l, i) cpu_local_wrap(local_set(&__get_cpu_var(l), (i))) +#define cpu_local_inc (l) cpu_local_wrap(local_inc(&__get_cpu_var(l))) +#define cpu_local_dec (l) cpu_local_wrap(local_dec(&__get_cpu_var(l))) +#define cpu_local_add (i, l) cpu_local_wrap(local_add((i), &__get_cpu_var(l))) +#define cpu_local_sub (i, l) cpu_local_wrap(local_sub((i), &__get_cpu_var(l))) + +#define __cpu_local_inc (l) cpu_local_inc(l) +#define __cpu_local_dec (l) cpu_local_dec(l) +#define __cpu_local_add (i, l) cpu_local_add((i), (l)) +#define __cpu_local_sub (i, l) cpu_local_sub((i), (l)) +#endif /* _ARCH_MIPS_LOCAL_H */