Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / ipc / util.h

diff --git a/ipc/util.h b/ipc/util.h
index 2578fd9be83560574cbd24d53ee2300e83ed90d3..c692010e6f0a394d1d796e33fda3b6b5e46ca16f 100644 (file)
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -113,13 +113,12 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flg);
  * getref increases the refcount, the putref call that reduces the recount
  * to 0 schedules the rcu destruction. Caller must guarantee locking.
  *
- * struct kern_ipc_perm must be the first member in the allocated structure.
+ * refcount is initialized by ipc_addid(), before that point call_rcu()
+ * must be used.
  */
-struct kern_ipc_perm *ipc_rcu_alloc(int size);
 int ipc_rcu_getref(struct kern_ipc_perm *ptr);
 void ipc_rcu_putref(struct kern_ipc_perm *ptr,
                        void (*func)(struct rcu_head *head));
-void ipc_rcu_free(struct rcu_head *h);
 
 struct kern_ipc_perm *ipc_lock(struct ipc_ids *, int);
 struct kern_ipc_perm *ipc_obtain_object_idr(struct ipc_ids *ids, int id);