From 421680fb0535bb7cdb1ea14c629d575d36d6e748 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri, 5 Mar 2010 21:03:35 +0000
Subject: [PATCH] --- yaml --- r: 187962 b: refs/heads/master c:
 10cc2b50eb4b01ca4dc014af2094d28b4ebe20d7 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/net/bridge/br_multicast.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index debc0b8996f3..41d020b17888 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49f5fcfd4ac3df24aa66520e1c5f37db5dfa8c10
+refs/heads/master: 10cc2b50eb4b01ca4dc014af2094d28b4ebe20d7
diff --git a/trunk/net/bridge/br_multicast.c b/trunk/net/bridge/br_multicast.c
index a1ffe1582c9a..12ce1eaa4f3e 100644
--- a/trunk/net/bridge/br_multicast.c
+++ b/trunk/net/bridge/br_multicast.c
@@ -1135,7 +1135,7 @@ void br_multicast_stop(struct net_bridge *br)
 
 	if (mdb->old) {
 		spin_unlock_bh(&br->multicast_lock);
-		synchronize_rcu_bh();
+		rcu_barrier_bh();
 		spin_lock_bh(&br->multicast_lock);
 		WARN_ON(mdb->old);
 	}