LU-2800 autoconf: remove topology checks

[fs/lustre-release.git] / libcfs / libcfs / linux / linux-cpu.c

diff --git a/libcfs/libcfs/linux/linux-cpu.c b/libcfs/libcfs/linux/linux-cpu.c
index 99327ba..95777a8 100644 (file)
--- a/libcfs/libcfs/linux/linux-cpu.c
+++ b/libcfs/libcfs/linux/linux-cpu.c
@@ -79,15 +79,8 @@ static struct cfs_cpt_data   cpt_data;
 void
 cfs_cpu_core_siblings(int cpu, cpumask_t *mask)
 {
-#if defined(HAVE_TOPOLOGY_CORE_CPUMASK) && defined(HAVE_CPUMASK_COPY)
        /* return cpumask of cores in the same socket */
        cpumask_copy(mask, topology_core_cpumask(cpu));
-#elif defined(HAVE_TOPOLOGY_CORE_SIBLINGS)
-       *mask = topology_core_siblings(cpu);
-#else
-       cpus_clear(*mask);
-       cpu_set(cpu, *mask);
-#endif
 }
 EXPORT_SYMBOL(cfs_cpu_core_siblings);
 
@@ -112,14 +105,7 @@ EXPORT_SYMBOL(cfs_cpu_core_nsiblings);
 void
 cfs_cpu_ht_siblings(int cpu, cpumask_t *mask)
 {
-#if defined(HAVE_TOPOLOGY_THREAD_CPUMASK) && defined(HAVE_CPUMASK_COPY)
        cpumask_copy(mask, topology_thread_cpumask(cpu));
-#elif defined(HAVE_TOPOLOGY_THREAD_SIBLINGS)
-       *mask = topology_thread_siblings(cpu);
-#else
-       cpus_clear(*mask);
-       cpu_set(cpu, *mask);
-#endif
 }
 EXPORT_SYMBOL(cfs_cpu_ht_siblings);
 
@@ -143,17 +129,7 @@ EXPORT_SYMBOL(cfs_cpu_ht_nsiblings);
 void
 cfs_node_to_cpumask(int node, cpumask_t *mask)
 {
-#if defined(HAVE_CPUMASK_OF_NODE) && defined(HAVE_CPUMASK_COPY)
        cpumask_copy(mask, cpumask_of_node(node));
-#elif defined(HAVE_NODE_TO_CPUMASK)
-       *mask = node_to_cpumask(node);
-#else
-       cpus_clear(*mask);
-       for_each_online_cpu(i) {
-               if (cpu_to_node(i) == node)
-                       cpu_set(i, *mask);
-       }
-#endif
 }
 EXPORT_SYMBOL(cfs_node_to_cpumask);