cpumask: remove obsolete topology_core_siblings and topology_thread_siblings There were replaced by topology_core_cpumask and topology_thread_cpumask. Signed-off-by: Rusty Russell --- arch/ia64/include/asm/topology.h | 2 -- arch/powerpc/include/asm/topology.h | 2 -- arch/s390/include/asm/topology.h | 1 - arch/sparc/include/asm/topology_64.h | 2 -- arch/x86/include/asm/topology.h | 2 -- include/linux/topology.h | 6 ------ 6 files changed, 15 deletions(-) diff -r b1d85f253cf2 arch/ia64/include/asm/topology.h --- a/arch/ia64/include/asm/topology.h Thu Nov 20 11:58:09 2008 +1030 +++ b/arch/ia64/include/asm/topology.h Thu Nov 20 12:00:50 2008 +1030 @@ -110,8 +110,6 @@ #ifdef CONFIG_SMP #define topology_physical_package_id(cpu) (cpu_data(cpu)->socket_id) #define topology_core_id(cpu) (cpu_data(cpu)->core_id) -#define topology_core_siblings(cpu) (cpu_core_map[cpu]) -#define topology_thread_siblings(cpu) (per_cpu(cpu_sibling_map, cpu)) #define topology_core_cpumask(cpu) (&cpu_core_map[cpu]) #define topology_thread_cpumask(cpu) (&per_cpu(cpu_sibling_map, cpu)) #define smt_capable() (smp_num_siblings > 1) diff -r b1d85f253cf2 arch/powerpc/include/asm/topology.h --- a/arch/powerpc/include/asm/topology.h Thu Nov 20 11:58:09 2008 +1030 +++ b/arch/powerpc/include/asm/topology.h Thu Nov 20 12:00:50 2008 +1030 @@ -111,8 +111,6 @@ #ifdef CONFIG_PPC64 #include -#define topology_thread_siblings(cpu) (per_cpu(cpu_sibling_map, cpu)) -#define topology_core_siblings(cpu) (per_cpu(cpu_core_map, cpu)) #define topology_thread_cpumask(cpu) (&per_cpu(cpu_sibling_map, cpu)) #define topology_core_cpumask(cpu) (&per_cpu(cpu_core_map, cpu)) #define topology_core_id(cpu) (cpu_to_core_id(cpu)) diff -r b1d85f253cf2 arch/s390/include/asm/topology.h --- a/arch/s390/include/asm/topology.h Thu Nov 20 11:58:09 2008 +1030 +++ b/arch/s390/include/asm/topology.h Thu Nov 20 12:00:50 2008 +1030 @@ -9,7 +9,6 @@ extern cpumask_t cpu_core_map[NR_CPUS]; -#define topology_core_siblings(cpu) (cpu_core_map[cpu]) #define topology_core_cpumask(cpu) (&cpu_core_map[cpu]) int topology_set_cpu_management(int fc); diff -r b1d85f253cf2 arch/sparc/include/asm/topology_64.h --- a/arch/sparc/include/asm/topology_64.h Thu Nov 20 11:58:09 2008 +1030 +++ b/arch/sparc/include/asm/topology_64.h Thu Nov 20 12:00:50 2008 +1030 @@ -77,8 +77,6 @@ #ifdef CONFIG_SMP #define topology_physical_package_id(cpu) (cpu_data(cpu).proc_id) #define topology_core_id(cpu) (cpu_data(cpu).core_id) -#define topology_core_siblings(cpu) (cpu_core_map[cpu]) -#define topology_thread_siblings(cpu) (per_cpu(cpu_sibling_map, cpu)) #define topology_core_cpumask(cpu) (&cpu_core_map[cpu]) #define topology_thread_cpumask(cpu) (&per_cpu(cpu_sibling_map, cpu)) #define mc_capable() (sparc64_multi_core) diff -r b1d85f253cf2 arch/x86/include/asm/topology.h --- a/arch/x86/include/asm/topology.h Thu Nov 20 11:58:09 2008 +1030 +++ b/arch/x86/include/asm/topology.h Thu Nov 20 12:00:50 2008 +1030 @@ -235,8 +235,6 @@ #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) -#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)) diff -r b1d85f253cf2 include/linux/topology.h --- a/include/linux/topology.h Thu Nov 20 11:58:09 2008 +1030 +++ b/include/linux/topology.h Thu Nov 20 12:00:50 2008 +1030 @@ -185,12 +185,6 @@ #ifndef topology_core_id #define topology_core_id(cpu) ((void)(cpu), 0) #endif -#ifndef topology_thread_siblings -#define topology_thread_siblings(cpu) cpumask_of_cpu(cpu) -#endif -#ifndef topology_core_siblings -#define topology_core_siblings(cpu) cpumask_of_cpu(cpu) -#endif #ifndef topology_thread_cpumask #define topology_thread_cpumask(cpu) cpumask_of(cpu) #endif