From a711806a3a4c971cdd9f3d1ab382a6dacf4a3aa7 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 31 Jul 2011 22:09:25 -0700
Subject: [PATCH] --- yaml --- r: 268971 b: refs/heads/master c:
 d322f45ceed525daa9401154590bbae3222cfefb h: refs/heads/master i:   268969:
 3d83717ea2def6af1c88498c90d0406623fbbbf3   268967:
 959b37d79379b80a05d06223ca35564e4922b401 v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/rcupdate.h | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index bccaf2c78017..c2ca6e77ba97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7eb4f4553ceaa6c64da83c8a71d5a991c0188655
+refs/heads/master: d322f45ceed525daa9401154590bbae3222cfefb
diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h
index caf22e84a743..d7accc5f8892 100644
--- a/trunk/include/linux/rcupdate.h
+++ b/trunk/include/linux/rcupdate.h
@@ -443,9 +443,7 @@ extern int rcu_my_thread_group_empty(void);
 	})
 #define __rcu_assign_pointer(p, v, space) \
 	({ \
-		if (!__builtin_constant_p(v) || \
-		    ((v) != NULL)) \
-			smp_wmb(); \
+		smp_wmb(); \
 		(p) = (typeof(*v) __force space *)(v); \
 	})