LU-9859 libcfs: replace all CFS_CAP_* macros with CAP_*

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

diff --git a/libcfs/include/libcfs/linux/linux-cpu.h b/libcfs/include/libcfs/linux/linux-cpu.h
index a8f132a..8353f69 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-cpu.h
+++ b/libcfs/include/libcfs/linux/linux-cpu.h
@@ -23,7 +23,7 @@
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -39,56 +39,15 @@
 #ifndef __LIBCFS_LINUX_CPU_H__
 #define __LIBCFS_LINUX_CPU_H__
 
-#ifndef __LIBCFS_LIBCFS_H__
-#error Do not #include this file directly. #include <libcfs/libcfs.h> instead
-#endif
-
-#ifndef __KERNEL__
-#error This include is only for kernel use.
-#endif
-
 #include <linux/cpu.h>
-#include <linux/cpuset.h>
-#include <linux/topology.h>
-#include <linux/version.h>
-
-#ifdef CONFIG_SMP
-
-#define HAVE_LIBCFS_CPT
-
-/** virtual processing unit */
-struct cfs_cpu_partition {
-       /* CPUs mask for this partition */
-       cpumask_t                       *cpt_cpumask;
-       /* nodes mask for this partition */
-       nodemask_t                      *cpt_nodemask;
-       /* spread rotor for NUMA allocator */
-       unsigned                        cpt_spread_rotor;
-};
-
-/** descriptor for CPU partitions */
-struct cfs_cpt_table {
-       /* spread rotor for NUMA allocator */
-       unsigned                        ctb_spread_rotor;
-       /* # of CPU partitions */
-       unsigned                        ctb_nparts;
-       /* partitions tables */
-       struct cfs_cpu_partition        *ctb_parts;
-       /* shadow HW CPU to CPU partition ID */
-       int                             *ctb_cpu2cpt;
-       /* all cpus in this partition table */
-       cpumask_t                       *ctb_cpumask;
-       /* all nodes in this partition table */
-       nodemask_t                      *ctb_nodemask;
-};
-
-void cfs_cpu_core_siblings(int cpu, cpumask_t *mask);
-int cfs_cpu_ht_nsiblings(int cpu);
-
-#endif /* CONFIG_SMP */
 
 #ifndef HAVE_TOPOLOGY_SIBLING_CPUMASK
 # define topology_sibling_cpumask(cpu) topology_thread_cpumask(cpu)
 #endif /* HAVE_TOPOLOGY_SIBLING_CPUMASK */
 
+#ifndef HAVE_CPUS_READ_LOCK
+# define cpus_read_lock                get_online_cpus
+# define cpus_read_unlock      put_online_cpus
+#endif
+
 #endif /* __LIBCFS_LINUX_CPU_H__ */