From: Mikhail Pershin <tappro@sun.com>
Date: Fri, 20 Aug 2010 16:29:06 +0000 (+0400)
Subject: b=22418 2.6.32 compat synchronize_rcu already defined
X-Git-Tag: 2.0.51.0~53
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=7e7ccbc109a05f780ca75dd30306b8d8bb415588

b=22418 2.6.32 compat synchronize_rcu already defined

i=adilger
i=kalpak
---

diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index 6498202..dcf399a 100644
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -627,8 +627,11 @@ static inline int ll_crypto_hmac(struct crypto_tfm *tfm,
 #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)