Messages in this thread |  | | Date | Tue, 4 Mar 2014 21:31:12 -0600 (CST) | From | Christoph Lameter <> | Subject | Re: [PATCH 31/48] uv: Replace __get_cpu_var |
| |
On Tue, 4 Mar 2014, Andrew Morton wrote:
> > > > ... > > > > --- linux.orig/arch/x86/include/asm/uv/uv_hub.h 2014-02-03 14:16:53.987889372 -0600 > > +++ linux/arch/x86/include/asm/uv/uv_hub.h 2014-02-03 14:16:53.987889372 -0600 > > @@ -618,7 +618,7 @@ > > }; > > > > DECLARE_PER_CPU(struct uv_cpu_nmi_s, __uv_cpu_nmi); > > -#define uv_cpu_nmi (__get_cpu_var(__uv_cpu_nmi)) > > +#define uv_cpu_nmi __this_cpu_read(_uv_cpu_nmi) > > arch/x86/platform/uv/uv_nmi.c: In function 'uv_check_nmi': > arch/x86/platform/uv/uv_nmi.c:218: error: '_uv_cpu_nmi' undeclared (first use in this function) > arch/x86/platform/uv/uv_nmi.c:218: error: (Each undeclared identifier is reported only once > arch/x86/platform/uv/uv_nmi.c:218: error: for each function it appears in.) > > > This?
Nope. I missed an underscore.
> --- a/arch/x86/include/asm/uv/uv_hub.h~uv-replace-__get_cpu_var-fix > +++ a/arch/x86/include/asm/uv/uv_hub.h > @@ -618,7 +618,7 @@ struct uv_cpu_nmi_s { > }; > > DECLARE_PER_CPU(struct uv_cpu_nmi_s, __uv_cpu_nmi); > -#define uv_cpu_nmi __this_cpu_read(_uv_cpu_nmi) > +#define uv_cpu_nmi (*this_cpu_ptr(&__uv_cpu_nmi))
__this_cpu_read(__uv_cpu_nmi)
|  |