From 440d5b2c1e96c02fed5b839f5cd354032482cd3f Mon Sep 17 00:00:00 2001 From: Wally Wang Date: Thu, 12 Jan 2012 16:12:54 -0800 Subject: [PATCH] LU-812 synchronize_rcu no longer a define synchronize_kernel() in old kernel(pre 2.6.12) is no longer supported and synchronize_rcu is no longer a define after 2.6.33. Remove the no longer used old code. Change-Id: Iac668efc35d82e6218b1924eca009f92d19a0c7a Signed-off-by: Wally Wang Reviewed-on: http://review.whamcloud.com/1952 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/autoconf/lustre-core.m4 | 11 ----------- lustre/include/linux/lustre_compat25.h | 7 ------- 2 files changed, 18 deletions(-) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 10fea4d..b069946 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -850,17 +850,6 @@ LB_LINUX_TRY_COMPILE([ EXTRA_KCFLAGS="$tmp_flags" ]) -# LC_EXPORT_SYNCHRONIZE_RCU -# after 2.6.12 synchronize_rcu is preferred over synchronize_kernel -AC_DEFUN([LC_EXPORT_SYNCHRONIZE_RCU], -[LB_CHECK_SYMBOL_EXPORT([synchronize_rcu], -[kernel/rcupdate.c],[ - AC_DEFINE(HAVE_SYNCHRONIZE_RCU, 1, - [in 2.6.12 synchronize_rcu preferred over synchronize_kernel]) -],[ -]) -]) - # 2.6.15 # LC_INODE_I_MUTEX diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h index 0ecd59f..470b2b7 100644 --- a/lustre/include/linux/lustre_compat25.h +++ b/lustre/include/linux/lustre_compat25.h @@ -684,13 +684,6 @@ static inline int ll_crypto_hmac(struct crypto_tfm *tfm, #define ll_crypto_tfm_alg_max_keysize crypto_tfm_alg_max_keysize #endif /* HAVE_ASYNC_BLOCK_CIPHER */ -#ifndef HAVE_SYNCHRONIZE_RCU -/* Linux 2.6.32 provides define when !CONFIG_TREE_PREEMPT_RCU */ -#ifndef synchronize_rcu -#define synchronize_rcu() synchronize_kernel() -#endif -#endif - #ifdef HAVE_FILE_REMOVE_SUID # define ll_remove_suid(file, mnt) file_remove_suid(file) #else -- 1.8.3.1