[PATCH 1/2] UV: NMI: insert per_cpu accessor function on uv_hub_nmi.

[George Beshers]

UV: NMI: insert this_cpu_read accessor function on uv_hub_nmi.

UV NMI was accidently broken by this patch.

    commit e16321709c8270f9803bbfdb51e5e02235078c7f
    Author: Christoph Lameter <cl@xxxxxxxxx>
    Date:   Sun Aug 17 12:30:41 2014 -0500

This patch insert this_cpu_read() on when accessing the
PER_CPU uv_cpu_nmi variable.

Signed-off-by: George Beshers <gbeshers@xxxxxxx>
Acked-by: Mike Travis <travis@xxxxxxx>
Cc: Russ Anderson <rja@xxxxxxx>
Cc: Dimitri Sivanich <sivanich@xxxxxxx>
Cc: Hedi Berriche <hedi@xxxxxxx>
Cc: Alex Thorlton <athorlton@xxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxx>

diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index a00ad8f..ea707478 100644
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -609,7 +609,7 @@ struct uv_cpu_nmi_s {
 
 DECLARE_PER_CPU(struct uv_cpu_nmi_s, uv_cpu_nmi);
 
-#define uv_hub_nmi			(uv_cpu_nmi.hub)
+#define uv_hub_nmi			this_cpu_read(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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/