From: Peng Tao <bergwolf@gmail.com>
Date: Tue, 19 Nov 2013 14:38:45 +0000 (+0800)
Subject: staging/lustre: get_cpu is always defined
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9f773620f1c14e4b0e8e2e17792d559f2e39fb44;p=openwrt%2Fstaging%2Fblogic.git

staging/lustre: get_cpu is always defined

Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
index 44f490ca782e..e6f03c7ae006 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
@@ -206,18 +206,6 @@ extern int  lwt_snapshot (cfs_cycles_t *now, int *ncpu, int *total_size,
 
 /* compat macroses */
 
-
-#ifndef get_cpu
-# ifdef CONFIG_PREEMPT
-#  define get_cpu()  ({ preempt_disable(); smp_processor_id(); })
-#  define put_cpu()  preempt_enable()
-# else
-#  define get_cpu()  smp_processor_id()
-#  define put_cpu()
-# endif
-#else
-#endif /* get_cpu & put_cpu */
-
 #define INIT_CTL_NAME(a)
 #define INIT_STRATEGY(a)