Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 847e0fb2 authored Jul 24, 2013 by Greg Kroah-Hartman

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>

parent c0426cf7

drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -81,7 +81,6 @@ struct cfs_cpt_table {

	/**		/**
	* comment out definitions for compatible layer		* comment out definitions for compatible layer
	* #define CFS_CPU_NR NR_CPUS
	*		*
	* typedef cpumask_t cfs_cpumask_t;		* typedef cpumask_t cfs_cpumask_t;
	*		*

drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -73,11 +73,6 @@
	#define cfs_for_each_possible_cpu(cpu) for_each_cpu(cpu)		#define cfs_for_each_possible_cpu(cpu) for_each_cpu(cpu)
	#endif		#endif

	#ifdef NR_CPUS
	#else
	#define NR_CPUS 1
	#endif

	/*		/*
	* Sysctl register		* Sysctl register
	*/		*/

drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -104,11 +104,6 @@ int proc_call_handler(void *data, int write,
	#define cfs_for_each_possible_cpu(cpu) for_each_cpu(cpu)		#define cfs_for_each_possible_cpu(cpu) for_each_cpu(cpu)
	#endif		#endif

	#ifdef NR_CPUS
	#else
	#define NR_CPUS 1
	#endif

	#define cfs_register_sysctl_table(t, a) register_sysctl_table(t)		#define cfs_register_sysctl_table(t, a) register_sysctl_table(t)

	#endif /* _PORTALS_COMPAT_H */		#endif /* _PORTALS_COMPAT_H */