From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757174AbcEDHSq (ORCPT ); Wed, 4 May 2016 03:18:46 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37592 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751256AbcEDHSo (ORCPT ); Wed, 4 May 2016 03:18:44 -0400 Date: Wed, 4 May 2016 00:17:37 -0700 From: tip-bot for Mike Travis Message-ID: Cc: nzimmer@sgi.com, dvlasenk@redhat.com, rja@sgi.com, hpa@zytor.com, mingo@kernel.org, akpm@linux-foundation.org, luto@amacapital.net, abanman@sgi.com, peterz@infradead.org, brgerst@gmail.com, gfk@sgi.com, linux-kernel@vger.kernel.org, len.brown@intel.com, travis@sgi.com, bp@alien8.de, sivanich@sgi.com, estabrook@sgi.com, tglx@linutronix.de, torvalds@linux-foundation.org Reply-To: rja@sgi.com, hpa@zytor.com, mingo@kernel.org, nzimmer@sgi.com, dvlasenk@redhat.com, peterz@infradead.org, brgerst@gmail.com, gfk@sgi.com, akpm@linux-foundation.org, luto@amacapital.net, abanman@sgi.com, len.brown@intel.com, travis@sgi.com, bp@alien8.de, linux-kernel@vger.kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org, sivanich@sgi.com, estabrook@sgi.com In-Reply-To: <20160429215403.934728974@asylum.americas.sgi.com> References: <20160429215403.934728974@asylum.americas.sgi.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/platform/UV: Clean up redunduncies after merge of UV4 MMR definitions Git-Commit-ID: b608f87fe886d3ef7f9f8eb8ba58f45beb61c286 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b608f87fe886d3ef7f9f8eb8ba58f45beb61c286 Gitweb: http://git.kernel.org/tip/b608f87fe886d3ef7f9f8eb8ba58f45beb61c286 Author: Mike Travis AuthorDate: Fri, 29 Apr 2016 16:54:10 -0500 Committer: Ingo Molnar CommitDate: Wed, 4 May 2016 08:48:48 +0200 x86/platform/UV: Clean up redunduncies after merge of UV4 MMR definitions Clean up any redundancies caused by new UV4 MMR definitions superseding any previously definitions local to functions. Tested-by: John Estabrook Tested-by: Gary Kroening Tested-by: Nathan Zimmer Signed-off-by: Mike Travis Reviewed-by: Dimitri Sivanich Reviewed-by: Andrew Banman Cc: Andrew Morton Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Len Brown Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Russ Anderson Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20160429215403.934728974@asylum.americas.sgi.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/uv/uv_hub.h | 9 --------- arch/x86/kernel/apic/x2apic_uv_x.c | 1 - 2 files changed, 10 deletions(-) diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h index ffbc1c7..eda54cf 100644 --- a/arch/x86/include/asm/uv/uv_hub.h +++ b/arch/x86/include/asm/uv/uv_hub.h @@ -549,8 +549,6 @@ struct uv_blade_info { unsigned short nr_online_cpus; unsigned short pnode; short memory_nid; - spinlock_t nmi_lock; /* obsolete, see uv_hub_nmi */ - unsigned long nmi_count; /* obsolete, see uv_hub_nmi */ }; extern struct uv_blade_info *uv_blade_info; extern short *uv_node_to_blade; @@ -635,14 +633,7 @@ extern void uv_nmi_setup(void); /* Newer SMM NMI handler, not present in all systems */ #define UVH_NMI_MMRX UVH_EVENT_OCCURRED0 #define UVH_NMI_MMRX_CLEAR UVH_EVENT_OCCURRED0_ALIAS - -#ifdef UVH_EVENT_OCCURRED0_EXTIO_INT0_SHFT #define UVH_NMI_MMRX_SHIFT UVH_EVENT_OCCURRED0_EXTIO_INT0_SHFT -#else -#define UVH_NMI_MMRX_SHIFT (is_uv1_hub() ? \ - UV1H_EVENT_OCCURRED0_EXTIO_INT0_SHFT :\ - UVXH_EVENT_OCCURRED0_EXTIO_INT0_SHFT) -#endif #define UVH_NMI_MMRX_TYPE "EXTIO_INT0" /* Non-zero indicates newer SMM NMI handler present */ diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 3853c7b..db5d980 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -1024,7 +1024,6 @@ void __init uv_system_init(void) uv_blade_info[blade].pnode = pnode; uv_blade_info[blade].nr_possible_cpus = 0; uv_blade_info[blade].nr_online_cpus = 0; - spin_lock_init(&uv_blade_info[blade].nmi_lock); min_pnode = min(pnode, min_pnode); max_pnode = max(pnode, max_pnode); blade++;