diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-24 10:25:17 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-24 10:25:17 -0700 |
| commit | 847e0fb220799debd44cb4b8526a248a287913d9 (patch) | |
| tree | 81e18a0531a96aeccda7b9ae9014a9a44e76555b /drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h | |
| parent | c0426cf7df119c68a9715713f9dbf07862172f04 (diff) | |
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>
Diffstat (limited to 'drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h')
| -rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h | 5 |
1 files changed, 0 insertions, 5 deletions
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 03903ab8f0cc..e2a6c10ae4e6 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 */ |