From ca4613fc0b6dd14a0af7342aaeb63fb1710b1f95 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 13 Mar 2009 14:49:48 +1030 Subject: [PATCH] --- yaml --- r: 140541 b: refs/heads/master c: d3d2e7f24384cccedd29a0582ad4b014ac646abc h: refs/heads/master i: 140539: c49d1a43fcb9c59840cbed6a1cef7925f7d310ad v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/topology.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6337c178d747..7bd6022d0b2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23c5c9c66263311de1295b42382e5bc1e7c36c47 +refs/heads/master: d3d2e7f24384cccedd29a0582ad4b014ac646abc diff --git a/trunk/arch/x86/include/asm/topology.h b/trunk/arch/x86/include/asm/topology.h index 6b954fbd7872..f7c20d031422 100644 --- a/trunk/arch/x86/include/asm/topology.h +++ b/trunk/arch/x86/include/asm/topology.h @@ -249,8 +249,6 @@ 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) -#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))