Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[sfrench/cifs-2.6.git] / include / linux / ipc.h

diff --git a/include/linux/ipc.h b/include/linux/ipc.h
index 1980867a64a4cb3e84ab57f5ee93cd66fefb8419..b8826107b5180e78b163e3b92f605bf7dcd22faf 100644 (file)
--- a/include/linux/ipc.h
+++ b/include/linux/ipc.h
@@ -49,9 +49,38 @@ struct ipc_perm
 #define IPC_64  0x0100  /* New version (support 32-bit UIDs, bigger
                           message sizes, etc. */
 
+/*
+ * These are used to wrap system calls.
+ *
+ * See architecture code for ugly details..
+ */
+struct ipc_kludge {
+       struct msgbuf __user *msgp;
+       long msgtyp;
+};
+
+#define SEMOP           1
+#define SEMGET          2
+#define SEMCTL          3
+#define SEMTIMEDOP      4
+#define MSGSND         11
+#define MSGRCV         12
+#define MSGGET         13
+#define MSGCTL         14
+#define SHMAT          21
+#define SHMDT          22
+#define SHMGET         23
+#define SHMCTL         24
+
+/* Used by the DIPC package, try and avoid reusing it */
+#define DIPC            25
+
+#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) */
 
@@ -60,6 +89,7 @@ struct kern_ipc_perm
 {
        spinlock_t      lock;
        int             deleted;
+       int             id;
        key_t           key;
        uid_t           uid;
        gid_t           gid;
@@ -70,61 +100,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;
-
-       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 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
-
-#ifdef CONFIG_IPC_NS
-extern void free_ipc_ns(struct kref *kref);
-#endif
-
-static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-{
-#ifdef CONFIG_IPC_NS
-       if (ns)
-               kref_get(&ns->kref);
-#endif
-       return ns;
-}
-
-static inline void put_ipc_ns(struct ipc_namespace *ns)
-{
-#ifdef CONFIG_IPC_NS
-       kref_put(&ns->kref, free_ipc_ns);
-#endif
-}
-
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_IPC_H */
-
-