Import of Linux/MIPS 2.1.14

1 files changed, 9 insertions, 32 deletions

diff --git a/include/linux/ipc.h b/include/linux/ipc.h
index 3878e0203..9349f0f49 100644
--- a/include/linux/ipc.h
+++ b/include/linux/ipc.h
@@ -1,22 +1,21 @@
 #ifndef _LINUX_IPC_H
 #define _LINUX_IPC_H
+
 #include <linux/types.h>
 
-typedef int key_t; 		/* should go in <types.h> type for IPC key */
-#define IPC_PRIVATE ((key_t) 0)  
+#define IPC_PRIVATE ((__kernel_key_t) 0)  
 
 struct ipc_perm
 {
-  key_t  key;
-  ushort uid;   /* owner euid and egid */
-  ushort gid;
-  ushort cuid;  /* creator euid and egid */
-  ushort cgid;
-  ushort mode;  /* access modes see mode flags below */
-  ushort seq;   /* sequence number */
+	__kernel_key_t	key;
+	__kernel_uid_t	uid;
+	__kernel_gid_t	gid;
+	__kernel_uid_t	cuid;
+	__kernel_gid_t	cgid;
+	__kernel_mode_t	mode; 
+	unsigned short	seq;
 };
 
-
 /* resource get request flags */
 #define IPC_CREAT  00001000   /* create if key is nonexistent */
 #define IPC_EXCL   00002000   /* fail if key exists */
@@ -38,28 +37,6 @@ struct ipc_perm
 #define IPC_UNUSED	((void *) -1)
 #define IPC_NOID	((void *) -2)		/* being allocated/destroyed */
 
-/* 
- * These are used to wrap system calls. See ipc/util.c.
- */
-struct ipc_kludge {
-    struct msgbuf *msgp;
-    long msgtyp;
-};
-
-#define SEMOP	 	1
-#define SEMGET 		2
-#define SEMCTL 		3
-#define MSGSND 		11
-#define MSGRCV 		12
-#define MSGGET 		13
-#define MSGCTL 		14
-#define SHMAT 		21
-#define SHMDT 		22
-#define SHMGET 		23
-#define SHMCTL 		24
-
-#define IPCCALL(version,op)	((version)<<16 | (op))
-
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_IPC_H */