[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20140304150217.ac9d364008a3c95cb2a79b34@linux-foundation.org>
Date: Tue, 4 Mar 2014 15:02:17 -0800
From: Andrew Morton <akpm@...ux-foundation.org>
To: Christoph Lameter <cl@...ux.com>
Cc: Tejun Heo <tj@...nel.org>, akpm@...uxfoundation.org,
rostedt@...dmis.org, linux-kernel@...r.kernel.org,
Ingo Molnar <mingo@...nel.org>,
Peter Zijlstra <peterz@...radead.org>,
Thomas Gleixner <tglx@...utronix.de>,
Hedi Berriche <hedi@....com>, Mike Travis <travis@....com>,
Dimitri Sivanich <sivanich@....com>
Subject: Re: [PATCH 31/48] uv: Replace __get_cpu_var
On Fri, 14 Feb 2014 14:19:12 -0600 Christoph Lameter <cl@...ux.com> wrote:
> Use __this_cpu_read instead.
>
> ...
>
> --- 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?
--- 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))
#define uv_hub_nmi (uv_cpu_nmi.hub)
#define uv_cpu_nmi_per(cpu) (per_cpu(__uv_cpu_nmi, cpu))
#define uv_hub_nmi_per(cpu) (uv_cpu_nmi_per(cpu).hub)
_
--
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