From: Greg Kroah-Hartman Date: Wed, 24 Jul 2013 17:25:17 +0000 (-0700) Subject: staging: lustre: NR_CPUS is always defined X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=847e0fb220799debd44cb4b8526a248a287913d9;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git staging: lustre: NR_CPUS is always defined So don't redefine it. Cc: Peng Tao Cc: Andreas Dilger Signed-off-by: Greg Kroah-Hartman --- 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 36928791e75d..8dd354d51606 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 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 */ 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 132a4bec3575..6cf758dbf9ef 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 */