Merge commit 'v2.6.32-rc5' into perf/probes

[karo-tx-linux.git] / include / linux / topology.h

diff --git a/include/linux/topology.h b/include/linux/topology.h
index 809b26c07090b11ea8966b4efd756e03aa7ef4cf..fc0bf3edeb6705814af2b1ba8428fc0a39e78e0b 100644 (file)
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -211,12 +211,6 @@ int arch_update_cpu_topology(void);
 #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