fix hppfs Makefile breakage

[linux-2.6] / include / linux / ipc.h

diff --git a/include/linux/ipc.h b/include/linux/ipc.h
index b291189737e747178b664d1d312e8b737442d790..b8826107b5180e78b163e3b92f605bf7dcd22faf 100644 (file)
--- a/include/linux/ipc.h
+++ b/include/linux/ipc.h
@@ -49,8 +49,39 @@ 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) */
 
 /* used by in-kernel data structures */
@@ -58,6 +89,7 @@ struct kern_ipc_perm
 {
        spinlock_t      lock;
        int             deleted;
+       int             id;
        key_t           key;
        uid_t           uid;
        gid_t           gid;
@@ -71,5 +103,3 @@ struct kern_ipc_perm
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_IPC_H */
-
-