rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER

[pandora-kernel.git] / net / ipv4 / netfilter / nf_nat_pptp.c

diff --git a/net/ipv4/netfilter/nf_nat_pptp.c b/net/ipv4/netfilter/nf_nat_pptp.c
index 4c06003..3e8284b 100644 (file)
--- a/net/ipv4/netfilter/nf_nat_pptp.c
+++ b/net/ipv4/netfilter/nf_nat_pptp.c
@@ -282,25 +282,25 @@ static int __init nf_nat_helper_pptp_init(void)
        nf_nat_need_gre();
 
        BUG_ON(nf_nat_pptp_hook_outbound != NULL);
-       rcu_assign_pointer(nf_nat_pptp_hook_outbound, pptp_outbound_pkt);
+       RCU_INIT_POINTER(nf_nat_pptp_hook_outbound, pptp_outbound_pkt);
 
        BUG_ON(nf_nat_pptp_hook_inbound != NULL);
-       rcu_assign_pointer(nf_nat_pptp_hook_inbound, pptp_inbound_pkt);
+       RCU_INIT_POINTER(nf_nat_pptp_hook_inbound, pptp_inbound_pkt);
 
        BUG_ON(nf_nat_pptp_hook_exp_gre != NULL);
-       rcu_assign_pointer(nf_nat_pptp_hook_exp_gre, pptp_exp_gre);
+       RCU_INIT_POINTER(nf_nat_pptp_hook_exp_gre, pptp_exp_gre);
 
        BUG_ON(nf_nat_pptp_hook_expectfn != NULL);
-       rcu_assign_pointer(nf_nat_pptp_hook_expectfn, pptp_nat_expected);
+       RCU_INIT_POINTER(nf_nat_pptp_hook_expectfn, pptp_nat_expected);
        return 0;
 }
 
 static void __exit nf_nat_helper_pptp_fini(void)
 {
-       rcu_assign_pointer(nf_nat_pptp_hook_expectfn, NULL);
-       rcu_assign_pointer(nf_nat_pptp_hook_exp_gre, NULL);
-       rcu_assign_pointer(nf_nat_pptp_hook_inbound, NULL);
-       rcu_assign_pointer(nf_nat_pptp_hook_outbound, NULL);
+       RCU_INIT_POINTER(nf_nat_pptp_hook_expectfn, NULL);
+       RCU_INIT_POINTER(nf_nat_pptp_hook_exp_gre, NULL);
+       RCU_INIT_POINTER(nf_nat_pptp_hook_inbound, NULL);
+       RCU_INIT_POINTER(nf_nat_pptp_hook_outbound, NULL);
        synchronize_rcu();
 }