diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-arm/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-blackfin/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-cris/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-frv/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-generic/Kbuild | 1 | ||||
-rw-r--r-- | include/asm-generic/ipc.h | 31 | ||||
-rw-r--r-- | include/asm-h8300/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-m32r/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-m68k/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-m68knommu/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-mips/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-powerpc/Kbuild | 1 | ||||
-rw-r--r-- | include/asm-powerpc/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-s390/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-sh/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-sh64/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-sparc/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/Kbuild | 1 | ||||
-rw-r--r-- | include/asm-sparc64/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-um/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-v850/ipc.h | 1 | ||||
-rw-r--r-- | include/asm-x86/ipc.h | 1 | ||||
-rw-r--r-- | include/linux/ipc.h | 28 |
23 files changed, 28 insertions, 52 deletions
diff --git a/include/asm-arm/ipc.h b/include/asm-arm/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-arm/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-blackfin/ipc.h b/include/asm-blackfin/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-blackfin/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-cris/ipc.h b/include/asm-cris/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-cris/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-frv/ipc.h b/include/asm-frv/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-frv/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild index 5bfeef761649..c18110ee30f1 100644 --- a/include/asm-generic/Kbuild +++ b/include/asm-generic/Kbuild | |||
@@ -2,7 +2,6 @@ header-y += errno-base.h | |||
2 | header-y += errno.h | 2 | header-y += errno.h |
3 | header-y += fcntl.h | 3 | header-y += fcntl.h |
4 | header-y += ioctl.h | 4 | header-y += ioctl.h |
5 | header-y += ipc.h | ||
6 | header-y += mman.h | 5 | header-y += mman.h |
7 | header-y += poll.h | 6 | header-y += poll.h |
8 | header-y += signal.h | 7 | header-y += signal.h |
diff --git a/include/asm-generic/ipc.h b/include/asm-generic/ipc.h deleted file mode 100644 index a40407a165ce..000000000000 --- a/include/asm-generic/ipc.h +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | #ifndef _ASM_GENERIC_IPC_H | ||
2 | #define _ASM_GENERIC_IPC_H | ||
3 | /* | ||
4 | * These are used to wrap system calls. | ||
5 | * | ||
6 | * See architecture code for ugly details.. | ||
7 | */ | ||
8 | struct ipc_kludge { | ||
9 | struct msgbuf __user *msgp; | ||
10 | long msgtyp; | ||
11 | }; | ||
12 | |||
13 | #define SEMOP 1 | ||
14 | #define SEMGET 2 | ||
15 | #define SEMCTL 3 | ||
16 | #define SEMTIMEDOP 4 | ||
17 | #define MSGSND 11 | ||
18 | #define MSGRCV 12 | ||
19 | #define MSGGET 13 | ||
20 | #define MSGCTL 14 | ||
21 | #define SHMAT 21 | ||
22 | #define SHMDT 22 | ||
23 | #define SHMGET 23 | ||
24 | #define SHMCTL 24 | ||
25 | |||
26 | /* Used by the DIPC package, try and avoid reusing it */ | ||
27 | #define DIPC 25 | ||
28 | |||
29 | #define IPCCALL(version,op) ((version)<<16 | (op)) | ||
30 | |||
31 | #endif /* _ASM_GENERIC_IPC_H */ | ||
diff --git a/include/asm-h8300/ipc.h b/include/asm-h8300/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-h8300/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-m32r/ipc.h b/include/asm-m32r/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-m32r/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-m68k/ipc.h b/include/asm-m68k/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-m68k/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-m68knommu/ipc.h b/include/asm-m68knommu/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-m68knommu/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-mips/ipc.h b/include/asm-mips/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-mips/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-powerpc/Kbuild b/include/asm-powerpc/Kbuild index 626212c0fd6c..5f640e542475 100644 --- a/include/asm-powerpc/Kbuild +++ b/include/asm-powerpc/Kbuild | |||
@@ -13,7 +13,6 @@ header-y += shmbuf.h | |||
13 | header-y += socket.h | 13 | header-y += socket.h |
14 | header-y += termbits.h | 14 | header-y += termbits.h |
15 | header-y += fcntl.h | 15 | header-y += fcntl.h |
16 | header-y += ipc.h | ||
17 | header-y += poll.h | 16 | header-y += poll.h |
18 | header-y += sockios.h | 17 | header-y += sockios.h |
19 | header-y += ucontext.h | 18 | header-y += ucontext.h |
diff --git a/include/asm-powerpc/ipc.h b/include/asm-powerpc/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-powerpc/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-s390/ipc.h b/include/asm-s390/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-s390/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-sh/ipc.h b/include/asm-sh/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-sh/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-sh64/ipc.h b/include/asm-sh64/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-sh64/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-sparc/ipc.h b/include/asm-sparc/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-sparc/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild index 854fd3a65acf..a90dc82129d1 100644 --- a/include/asm-sparc64/Kbuild +++ b/include/asm-sparc64/Kbuild | |||
@@ -10,7 +10,6 @@ header-y += bbc.h | |||
10 | header-y += bpp.h | 10 | header-y += bpp.h |
11 | header-y += display7seg.h | 11 | header-y += display7seg.h |
12 | header-y += envctrl.h | 12 | header-y += envctrl.h |
13 | header-y += ipc.h | ||
14 | header-y += openprom.h | 13 | header-y += openprom.h |
15 | header-y += openpromio.h | 14 | header-y += openpromio.h |
16 | header-y += pconf.h | 15 | header-y += pconf.h |
diff --git a/include/asm-sparc64/ipc.h b/include/asm-sparc64/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-sparc64/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-um/ipc.h b/include/asm-um/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-um/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-v850/ipc.h b/include/asm-v850/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-v850/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/asm-x86/ipc.h b/include/asm-x86/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/include/asm-x86/ipc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ipc.h> | ||
diff --git a/include/linux/ipc.h b/include/linux/ipc.h index 3fd3ddd5f0d9..ee111834091c 100644 --- a/include/linux/ipc.h +++ b/include/linux/ipc.h | |||
@@ -49,6 +49,34 @@ struct ipc_perm | |||
49 | #define IPC_64 0x0100 /* New version (support 32-bit UIDs, bigger | 49 | #define IPC_64 0x0100 /* New version (support 32-bit UIDs, bigger |
50 | message sizes, etc. */ | 50 | message sizes, etc. */ |
51 | 51 | ||
52 | /* | ||
53 | * These are used to wrap system calls. | ||
54 | * | ||
55 | * See architecture code for ugly details.. | ||
56 | */ | ||
57 | struct ipc_kludge { | ||
58 | struct msgbuf __user *msgp; | ||
59 | long msgtyp; | ||
60 | }; | ||
61 | |||
62 | #define SEMOP 1 | ||
63 | #define SEMGET 2 | ||
64 | #define SEMCTL 3 | ||
65 | #define SEMTIMEDOP 4 | ||
66 | #define MSGSND 11 | ||
67 | #define MSGRCV 12 | ||
68 | #define MSGGET 13 | ||
69 | #define MSGCTL 14 | ||
70 | #define SHMAT 21 | ||
71 | #define SHMDT 22 | ||
72 | #define SHMGET 23 | ||
73 | #define SHMCTL 24 | ||
74 | |||
75 | /* Used by the DIPC package, try and avoid reusing it */ | ||
76 | #define DIPC 25 | ||
77 | |||
78 | #define IPCCALL(version,op) ((version)<<16 | (op)) | ||
79 | |||
52 | #ifdef __KERNEL__ | 80 | #ifdef __KERNEL__ |
53 | 81 | ||
54 | #include <linux/kref.h> | 82 | #include <linux/kref.h> |