diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 14:45:39 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 14:45:39 +0300 |
| commit | 9fedbb3b6bb8d00c973f01dcf14af8eedf5eb495 (patch) | |
| tree | cb4a1b2c48cf610ddf453c8138b58283936d0ff3 /arch/x86/include | |
| parent | fa70db3f19a183af5334edea5ad9e417c58faa5c (diff) | |
| parent | b77b5651082a4fa4091ac4e864254d9e71d15880 (diff) | |
| download | linux-9fedbb3b6bb8d00c973f01dcf14af8eedf5eb495.tar.xz | |
Merge branch 'x86/cpu' from tip
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/topology.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 7f991bd5031b..c9a4ed73aef4 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)) |