[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4B994E0C.1010503@caviumnetworks.com>
Date: Thu, 11 Mar 2010 12:09:48 -0800
From: David Daney <ddaney@...iumnetworks.com>
To: pjohn@...sta.com, Ralf Baechle <ralf@...ux-mips.org>
CC: linux-kernel@...r.kernel.org,
Christoph Lameter <cl@...ux-foundation.org>,
Tejun Heo <tj@...nel.org>
Subject: Re: [PATCH] MIPS: Fix compile error implicit declaration of function
cpu_local_wrap
On 03/11/2010 12:03 PM, Philby John wrote:
> 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.
>
> CC: Christoph Lameter<cl@...ux-foundation.org>
> CC: Tejun Heo<tj@...nel.org>
> CC: David Daney<ddaney@...iumnetworks.com>
> Signed-off-by: Philby John<pjohn@...sta.com>
Ralf is testing a different patch for this problem.
David Daney
> ---
> arch/mips/include/asm/local.h | 25 +++++++++++++++++++++++++
> 1 files changed, 25 insertions(+), 0 deletions(-)
>
> diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
> index bdcdef0..65ec69d 100644
> --- a/arch/mips/include/asm/local.h
> +++ b/arch/mips/include/asm/local.h
> @@ -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 */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists