powerpc/ps3: Fix hcall lv1_get_virtual_address_space_id_of_ppe

[karo-tx-linux.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index ffe92ca32f2acc031605e69d13614b6c8374bed3..2877647f347b06e75aaaa7fd355799a43cd65bf3 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -2472,7 +2472,7 @@ int sock_register(const struct net_proto_family *ops)
                                      lockdep_is_held(&net_family_lock)))
                err = -EEXIST;
        else {
-               rcu_assign_pointer(net_families[ops->family], ops);
+               RCU_INIT_POINTER(net_families[ops->family], ops);
                err = 0;
        }
        spin_unlock(&net_family_lock);
@@ -2500,7 +2500,7 @@ void sock_unregister(int family)
        BUG_ON(family < 0 || family >= NPROTO);
 
        spin_lock(&net_family_lock);
-       rcu_assign_pointer(net_families[family], NULL);
+       RCU_INIT_POINTER(net_families[family], NULL);
        spin_unlock(&net_family_lock);
 
        synchronize_rcu();