Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751547AbbD3NgG (ORCPT ); Thu, 30 Apr 2015 09:36:06 -0400 Received: from relay3.sgi.com ([192.48.152.1]:35950 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750902AbbD3NgD (ORCPT ); Thu, 30 Apr 2015 09:36:03 -0400 X-Greylist: delayed 407 seconds by postgrey-1.27 at vger.kernel.org; Thu, 30 Apr 2015 09:36:03 EDT From: George Beshers To: George Beshers , Mike Travis , linux-kernel@vger.kernel.org, Alex Thorlton , Dimitri Sivanich , Ingo Molnar , Hedi Berriche , Russ Anderson Cc: George Beshers Message-Id: <20150430132914.28122.11850.sendpatchset@gulag2.americas.sgi.com> Subject: [PATCH 1/2] UV: NMI: insert per_cpu accessor function on uv_hub_nmi. Date: Thu, 30 Apr 2015 08:29:14 -0500 (CDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1343 Lines: 37 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 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 Acked-by: Mike Travis Cc: Russ Anderson Cc: Dimitri Sivanich Cc: Hedi Berriche Cc: Alex Thorlton Cc: Christoph Lameter 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/