From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757036AbcEEJjD (ORCPT ); Thu, 5 May 2016 05:39:03 -0400 Received: from terminus.zytor.com ([198.137.202.10]:43918 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756986AbcEEJjA (ORCPT ); Thu, 5 May 2016 05:39:00 -0400 Date: Thu, 5 May 2016 02:37:52 -0700 From: tip-bot for Sudeep Holla Message-ID: Cc: dvlasenk@redhat.com, hpa@zytor.com, mingo@kernel.org, bp@alien8.de, linux-kernel@vger.kernel.org, sudeep.holla@arm.com, torvalds@linux-foundation.org, tglx@linutronix.de, luto@amacapital.net, brgerst@gmail.com, peterz@infradead.org, bp@suse.de Reply-To: bp@alien8.de, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, hpa@zytor.com, mingo@kernel.org, luto@amacapital.net, brgerst@gmail.com, peterz@infradead.org, bp@suse.de, sudeep.holla@arm.com, torvalds@linux-foundation.org, tglx@linutronix.de In-Reply-To: <1462380659-5968-1-git-send-email-sudeep.holla@arm.com> References: <1462380659-5968-1-git-send-email-sudeep.holla@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cpu] x86/topology: Remove redundant ENABLE_TOPO_DEFINES Git-Commit-ID: 3282e6b8f89eaeaf4915ee6cc57bcf06d1d6cead 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: 3282e6b8f89eaeaf4915ee6cc57bcf06d1d6cead Gitweb: http://git.kernel.org/tip/3282e6b8f89eaeaf4915ee6cc57bcf06d1d6cead Author: Sudeep Holla AuthorDate: Wed, 4 May 2016 17:50:59 +0100 Committer: Ingo Molnar CommitDate: Thu, 5 May 2016 08:42:48 +0200 x86/topology: Remove redundant ENABLE_TOPO_DEFINES Commit c8e56d20f2d1 ("x86: Kill CONFIG_X86_HT") removed CONFIG_X86_HT and defined ENABLE_TOPO_DEFINES always if CONFIG_SMP, which makes ENABLE_TOPO_DEFINES redundant. This patch removes the redundant ENABLE_TOPO_DEFINES and instead uses CONFIG_SMP directly Signed-off-by: Sudeep Holla Acked-by: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1462380659-5968-1-git-send-email-sudeep.holla@arm.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/topology.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 7f991bd5..c9a4ed7 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h @@ -25,16 +25,6 @@ #ifndef _ASM_X86_TOPOLOGY_H #define _ASM_X86_TOPOLOGY_H -#ifdef CONFIG_X86_32 -# ifdef CONFIG_SMP -# define ENABLE_TOPO_DEFINES -# endif -#else -# ifdef CONFIG_SMP -# define ENABLE_TOPO_DEFINES -# endif -#endif - /* * to preserve the visibility of NUMA_NO_NODE definition, * moved to there from here. May be used independent of @@ -123,7 +113,7 @@ extern const struct cpumask *cpu_coregroup_mask(int cpu); #define topology_physical_package_id(cpu) (cpu_data(cpu).phys_proc_id) #define topology_core_id(cpu) (cpu_data(cpu).cpu_core_id) -#ifdef ENABLE_TOPO_DEFINES +#ifdef CONFIG_SMP #define topology_core_cpumask(cpu) (per_cpu(cpu_core_map, cpu)) #define topology_sibling_cpumask(cpu) (per_cpu(cpu_sibling_map, cpu))