staging: lustre: NR_CPUS is always defined
So don't redefine it. Cc: Peng Tao <tao.peng@emc.com> Cc: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
c0426cf7df
commit
847e0fb220
@ -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;
|
||||
*
|
||||
|
@ -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
|
||||
*/
|
||||
|
@ -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 */
|
||||
|
Loading…
x
Reference in New Issue
Block a user