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>

diff --cc drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h
Simple merge

diff --cc drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
Simple merge

diff --cc drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
Simple merge