Merge branches 'core/futexes', 'core/locking', 'core/rcu' and 'linus' into core/urgent

[~andy/linux] / net / ipv4 / cipso_ipv4.c

diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index 2e78f6bd97756db7920367e5fe07ce23e6cd6eb7..e52799047a5feac1c018bc55b01bbce4ff8a8c06 100644 (file)
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -490,7 +490,6 @@ int cipso_v4_doi_add(struct cipso_v4_doi *doi_def)
        }
 
        atomic_set(&doi_def->refcount, 1);
-       INIT_RCU_HEAD(&doi_def->rcu);
 
        spin_lock(&cipso_v4_doi_list_lock);
        if (cipso_v4_doi_search(doi_def->doi) != NULL)