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

[pandora-kernel.git] / include / linux / ipc.h

diff --git a/include/linux/ipc.h b/include/linux/ipc.h
index 408696e..3b1594d 100644 (file)
--- a/include/linux/ipc.h
+++ b/include/linux/ipc.h
@@ -78,8 +78,6 @@ struct ipc_kludge {
 #define IPCCALL(version,op)    ((version)<<16 | (op))
 
 #ifdef __KERNEL__
-
-#include <linux/kref.h>
 #include <linux/spinlock.h>
 
 #define IPCMNI 32768  /* <= MAX_INT limit for ipc arrays (including sysctl changes) */
@@ -100,58 +98,6 @@ struct kern_ipc_perm
        void            *security;
 };
 
-struct ipc_ids;
-struct ipc_namespace {
-       struct kref     kref;
-       struct ipc_ids  *ids[3];
-
-       int             sem_ctls[4];
-       int             used_sems;
-
-       int             msg_ctlmax;
-       int             msg_ctlmnb;
-       int             msg_ctlmni;
-       atomic_t        msg_bytes;
-       atomic_t        msg_hdrs;
-
-       size_t          shm_ctlmax;
-       size_t          shm_ctlall;
-       int             shm_ctlmni;
-       int             shm_tot;
-};
-
-extern struct ipc_namespace init_ipc_ns;
-
-#ifdef CONFIG_SYSVIPC
-#define INIT_IPC_NS(ns)                .ns             = &init_ipc_ns,
-extern void free_ipc_ns(struct kref *kref);
-extern struct ipc_namespace *copy_ipcs(unsigned long flags,
-                                               struct ipc_namespace *ns);
-#else
-#define INIT_IPC_NS(ns)
-static inline struct ipc_namespace *copy_ipcs(unsigned long flags,
-                                               struct ipc_namespace *ns)
-{
-       return ns;
-}
-#endif
-
-static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-{
-#ifdef CONFIG_SYSVIPC
-       if (ns)
-               kref_get(&ns->kref);
-#endif
-       return ns;
-}
-
-static inline void put_ipc_ns(struct ipc_namespace *ns)
-{
-#ifdef CONFIG_SYSVIPC
-       kref_put(&ns->kref, free_ipc_ns);
-#endif
-}
-
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_IPC_H */