summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h1
-rw-r--r--drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h5
-rw-r--r--drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h5
3 files changed, 0 insertions, 11 deletions
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h
index 3692879..8dd354d 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h
@@ -81,7 +81,6 @@ struct cfs_cpt_table {
/**
* comment out definitions for compatible layer
- * #define CFS_CPU_NR NR_CPUS
*
* typedef cpumask_t cfs_cpumask_t;
*
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
index 03903ab..e2a6c10 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
@@ -73,11 +73,6 @@
#define cfs_for_each_possible_cpu(cpu) for_each_cpu(cpu)
#endif
-#ifdef NR_CPUS
-#else
-#define NR_CPUS 1
-#endif
-
/*
* Sysctl register
*/
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h b/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
index 132a4be..6cf758d 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
@@ -104,11 +104,6 @@ int proc_call_handler(void *data, int write,
#define cfs_for_each_possible_cpu(cpu) for_each_cpu(cpu)
#endif
-#ifdef NR_CPUS
-#else
-#define NR_CPUS 1
-#endif
-
#define cfs_register_sysctl_table(t, a) register_sysctl_table(t)
#endif /* _PORTALS_COMPAT_H */