diff --git a/[refs] b/[refs]
index b77365756e58..0fc987e58a4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f39234d60617d37818b30991e6794643ce220296
+refs/heads/master: 49d61e2390c92bd226fc395a6165eb5a65ae4de6
diff --git a/trunk/net/ipv4/tunnel4.c b/trunk/net/ipv4/tunnel4.c
index df59d16337f2..9a17bd2a0a37 100644
--- a/trunk/net/ipv4/tunnel4.c
+++ b/trunk/net/ipv4/tunnel4.c
@@ -39,7 +39,7 @@ int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family)
 	}
 
 	handler->next = *pprev;
-	*pprev = handler;
+	rcu_assign_pointer(*pprev, handler);
 
 	ret = 0;
 
diff --git a/trunk/net/ipv6/tunnel6.c b/trunk/net/ipv6/tunnel6.c
index 3177fe0459e0..d9864725d0c6 100644
--- a/trunk/net/ipv6/tunnel6.c
+++ b/trunk/net/ipv6/tunnel6.c
@@ -51,7 +51,7 @@ int xfrm6_tunnel_register(struct xfrm6_tunnel *handler, unsigned short family)
 	}
 
 	handler->next = *pprev;
-	*pprev = handler;
+	rcu_assign_pointer(*pprev, handler);
 
 	ret = 0;