aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2014-04-04 10:51:41 +0800
committerAlex Shi <alex.shi@linaro.org>2014-04-04 10:51:41 +0800
commit920553ba25498d26fbc7de610cdcf2f74d470ba0 (patch)
tree81d981168bbce09a7afda5b6780b72dc983ff1e5 /arch
parentf3124ba519b42426525585f50dbde3235b1fb89a (diff)
parent8f0c10ea2ec6e1086fbb73ff8bcbbf1ed8584b11 (diff)
downloadlinaro-lsk-920553ba25498d26fbc7de610cdcf2f74d470ba0.tar.gz
Merge tag 'v3.10.36' into linux-linaro-lsk
This is the 3.10.36 stable release
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/topology.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index 095b21507b6..60bd2748a7c 100644
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -119,9 +119,10 @@ static inline void setup_node_to_cpumask_map(void) { }
extern const struct cpumask *cpu_coregroup_mask(int cpu);
-#ifdef ENABLE_TOPO_DEFINES
#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
#define topology_core_cpumask(cpu) (per_cpu(cpu_core_map, cpu))
#define topology_thread_cpumask(cpu) (per_cpu(cpu_sibling_map, cpu))