aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2007-10-17 02:29:24 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:42:55 -0400
commitcba4fbbff2e9722e93b28e18fa7714b9013cbdda (patch)
tree6c070671e8df2d1e37fd50d7f2504d99a3f62c5f /include/asm-generic
parent4af3c9cc4fad54c3627e9afebf905aafde5690ed (diff)
remove include/asm-*/ipc.h
All asm/ipc.h files do only #include <asm-generic/ipc.h>. This patch therefore removes all include/asm-*/ipc.h files and moves the contents of include/asm-generic/ipc.h to include/linux/ipc.h. Signed-off-by: Adrian Bunk <bunk@kernel.org> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/Kbuild1
-rw-r--r--include/asm-generic/ipc.h31
2 files changed, 0 insertions, 32 deletions
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
2header-y += errno.h 2header-y += errno.h
3header-y += fcntl.h 3header-y += fcntl.h
4header-y += ioctl.h 4header-y += ioctl.h
5header-y += ipc.h
6header-y += mman.h 5header-y += mman.h
7header-y += poll.h 6header-y += poll.h
8header-y += signal.h 7header-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 */
8struct 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 */