aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/topology.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-17 13:08:34 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-17 13:08:34 +0100
commit9466d6036f73481104039fbe99338baed11c8fea (patch)
treecc889fa3071be5fba09417eb17be3c8d2c5271d0 /arch/x86/include/asm/topology.h
parent1f3f424a6bee9de4d839be9951f4296333fac014 (diff)
parent83b19597f793fd5f91533bda0dc2eb3d21936798 (diff)
downloadkernel_samsung_smdk4412-9466d6036f73481104039fbe99338baed11c8fea.tar.gz
kernel_samsung_smdk4412-9466d6036f73481104039fbe99338baed11c8fea.tar.bz2
kernel_samsung_smdk4412-9466d6036f73481104039fbe99338baed11c8fea.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for-ingo into cpus4096
Diffstat (limited to 'arch/x86/include/asm/topology.h')
-rw-r--r--arch/x86/include/asm/topology.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index ff386ff50ed..79e31e9dcdd 100644
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -226,6 +226,8 @@ extern cpumask_t cpu_coregroup_map(int cpu);
#define topology_core_id(cpu) (cpu_data(cpu).cpu_core_id)
#define topology_core_siblings(cpu) (per_cpu(cpu_core_map, cpu))
#define topology_thread_siblings(cpu) (per_cpu(cpu_sibling_map, cpu))
+#define topology_core_cpumask(cpu) (&per_cpu(cpu_core_map, cpu))
+#define topology_thread_cpumask(cpu) (&per_cpu(cpu_sibling_map, cpu))
/* indicates that pointers to the topology cpumask_t maps are valid */
#define arch_provides_topology_pointers yes