Commit 3282e6b8 authored May 04, 2016 by Sudeep Holla Committed by Ingo Molnar May 05, 2016

x86/topology: Remove redundant ENABLE_TOPO_DEFINES



Commit c8e56d20 ("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 <sudeep.holla@arm.com>
Acked-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1462380659-5968-1-git-send-email-sudeep.holla@arm.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent f3391a16

arch/x86/include/asm/topology.h

+1 −11

Original line number	Diff line number	Diff line
		@@ -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))