aboutsummaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--arch/arm/kernel/sys_arm.c2
-rw-r--r--arch/arm/kernel/sys_oabi-compat.c2
-rw-r--r--arch/cris/kernel/sys_cris.c2
-rw-r--r--arch/frv/kernel/sys_frv.c2
-rw-r--r--arch/h8300/kernel/sys_h8300.c2
-rw-r--r--arch/m32r/kernel/sys_m32r.c2
-rw-r--r--arch/m68k/kernel/sys_m68k.c2
-rw-r--r--arch/m68knommu/kernel/sys_m68k.c2
-rw-r--r--arch/mips/kernel/linux32.c2
-rw-r--r--arch/mips/kernel/syscall.c2
-rw-r--r--arch/powerpc/kernel/sys_ppc32.c2
-rw-r--r--arch/powerpc/kernel/syscalls.c1
-rw-r--r--arch/s390/kernel/compat_linux.c2
-rw-r--r--arch/s390/kernel/sys_s390.c2
-rw-r--r--arch/sh/kernel/sys_sh.c2
-rw-r--r--arch/sh64/kernel/sys_sh64.c2
-rw-r--r--arch/sparc/kernel/sys_sparc.c2
-rw-r--r--arch/sparc64/kernel/sys_sparc.c1
-rw-r--r--arch/sparc64/kernel/sys_sparc32.c1
-rw-r--r--arch/sparc64/solaris/ipc.c2
-rw-r--r--arch/um/sys-i386/syscalls.c2
-rw-r--r--arch/v850/kernel/syscalls.c1
-rw-r--r--arch/x86/ia32/ipc32.c2
-rw-r--r--arch/x86/kernel/sys_i386_32.c2
-rw-r--r--include/asm-arm/ipc.h1
-rw-r--r--include/asm-blackfin/ipc.h1
-rw-r--r--include/asm-cris/ipc.h1
-rw-r--r--include/asm-frv/ipc.h1
-rw-r--r--include/asm-generic/Kbuild1
-rw-r--r--include/asm-generic/ipc.h31
-rw-r--r--include/asm-h8300/ipc.h1
-rw-r--r--include/asm-m32r/ipc.h1
-rw-r--r--include/asm-m68k/ipc.h1
-rw-r--r--include/asm-m68knommu/ipc.h1
-rw-r--r--include/asm-mips/ipc.h1
-rw-r--r--include/asm-powerpc/Kbuild1
-rw-r--r--include/asm-powerpc/ipc.h1
-rw-r--r--include/asm-s390/ipc.h1
-rw-r--r--include/asm-sh/ipc.h1
-rw-r--r--include/asm-sh64/ipc.h1
-rw-r--r--include/asm-sparc/ipc.h1
-rw-r--r--include/asm-sparc64/Kbuild1
-rw-r--r--include/asm-sparc64/ipc.h1
-rw-r--r--include/asm-um/ipc.h1
-rw-r--r--include/asm-v850/ipc.h1
-rw-r--r--include/asm-x86/ipc.h1
-rw-r--r--include/linux/ipc.h28
47 files changed, 47 insertions, 77 deletions
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c
index 4d25e49a14f7..9bd1870d980e 100644
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@@ -26,9 +26,9 @@
26#include <linux/fs.h> 26#include <linux/fs.h>
27#include <linux/file.h> 27#include <linux/file.h>
28#include <linux/utsname.h> 28#include <linux/utsname.h>
29#include <linux/ipc.h>
29 30
30#include <asm/uaccess.h> 31#include <asm/uaccess.h>
31#include <asm/ipc.h>
32 32
33extern unsigned long do_mremap(unsigned long addr, unsigned long old_len, 33extern unsigned long do_mremap(unsigned long addr, unsigned long old_len,
34 unsigned long new_len, unsigned long flags, 34 unsigned long new_len, unsigned long flags,
diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c
index 8e2f9bc3368b..e8b98046895b 100644
--- a/arch/arm/kernel/sys_oabi-compat.c
+++ b/arch/arm/kernel/sys_oabi-compat.c
@@ -80,7 +80,7 @@
80#include <linux/sem.h> 80#include <linux/sem.h>
81#include <linux/socket.h> 81#include <linux/socket.h>
82#include <linux/net.h> 82#include <linux/net.h>
83#include <asm/ipc.h> 83#include <linux/ipc.h>
84#include <asm/uaccess.h> 84#include <asm/uaccess.h>
85 85
86struct oldabi_stat64 { 86struct oldabi_stat64 {
diff --git a/arch/cris/kernel/sys_cris.c b/arch/cris/kernel/sys_cris.c
index 0aa0e0ebb3a9..514359b8122e 100644
--- a/arch/cris/kernel/sys_cris.c
+++ b/arch/cris/kernel/sys_cris.c
@@ -21,9 +21,9 @@
21#include <linux/stat.h> 21#include <linux/stat.h>
22#include <linux/mman.h> 22#include <linux/mman.h>
23#include <linux/file.h> 23#include <linux/file.h>
24#include <linux/ipc.h>
24 25
25#include <asm/uaccess.h> 26#include <asm/uaccess.h>
26#include <asm/ipc.h>
27#include <asm/segment.h> 27#include <asm/segment.h>
28 28
29/* 29/*
diff --git a/arch/frv/kernel/sys_frv.c b/arch/frv/kernel/sys_frv.c
index 6fbe2665c577..04c6b1677ccf 100644
--- a/arch/frv/kernel/sys_frv.c
+++ b/arch/frv/kernel/sys_frv.c
@@ -23,10 +23,10 @@
23#include <linux/file.h> 23#include <linux/file.h>
24#include <linux/utsname.h> 24#include <linux/utsname.h>
25#include <linux/syscalls.h> 25#include <linux/syscalls.h>
26#include <linux/ipc.h>
26 27
27#include <asm/setup.h> 28#include <asm/setup.h>
28#include <asm/uaccess.h> 29#include <asm/uaccess.h>
29#include <asm/ipc.h>
30 30
31/* 31/*
32 * sys_pipe() is the normal C calling standard for creating 32 * sys_pipe() is the normal C calling standard for creating
diff --git a/arch/h8300/kernel/sys_h8300.c b/arch/h8300/kernel/sys_h8300.c
index ddc62727dc9f..00608be6d567 100644
--- a/arch/h8300/kernel/sys_h8300.c
+++ b/arch/h8300/kernel/sys_h8300.c
@@ -19,12 +19,12 @@
19#include <linux/file.h> 19#include <linux/file.h>
20#include <linux/utsname.h> 20#include <linux/utsname.h>
21#include <linux/fs.h> 21#include <linux/fs.h>
22#include <linux/ipc.h>
22 23
23#include <asm/setup.h> 24#include <asm/setup.h>
24#include <asm/uaccess.h> 25#include <asm/uaccess.h>
25#include <asm/cachectl.h> 26#include <asm/cachectl.h>
26#include <asm/traps.h> 27#include <asm/traps.h>
27#include <asm/ipc.h>
28#include <asm/unistd.h> 28#include <asm/unistd.h>
29 29
30/* 30/*
diff --git a/arch/m32r/kernel/sys_m32r.c b/arch/m32r/kernel/sys_m32r.c
index b13dbbeaeafa..0fc2efec18f6 100644
--- a/arch/m32r/kernel/sys_m32r.c
+++ b/arch/m32r/kernel/sys_m32r.c
@@ -20,11 +20,11 @@
20#include <linux/mman.h> 20#include <linux/mman.h>
21#include <linux/file.h> 21#include <linux/file.h>
22#include <linux/utsname.h> 22#include <linux/utsname.h>
23#include <linux/ipc.h>
23 24
24#include <asm/uaccess.h> 25#include <asm/uaccess.h>
25#include <asm/cachectl.h> 26#include <asm/cachectl.h>
26#include <asm/cacheflush.h> 27#include <asm/cacheflush.h>
27#include <asm/ipc.h>
28#include <asm/syscall.h> 28#include <asm/syscall.h>
29#include <asm/unistd.h> 29#include <asm/unistd.h>
30 30
diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c
index 36d78cf1a7bc..e892f17ba3fa 100644
--- a/arch/m68k/kernel/sys_m68k.c
+++ b/arch/m68k/kernel/sys_m68k.c
@@ -21,12 +21,12 @@
21#include <linux/mman.h> 21#include <linux/mman.h>
22#include <linux/file.h> 22#include <linux/file.h>
23#include <linux/utsname.h> 23#include <linux/utsname.h>
24#include <linux/ipc.h>
24 25
25#include <asm/setup.h> 26#include <asm/setup.h>
26#include <asm/uaccess.h> 27#include <asm/uaccess.h>
27#include <asm/cachectl.h> 28#include <asm/cachectl.h>
28#include <asm/traps.h> 29#include <asm/traps.h>
29#include <asm/ipc.h>
30#include <asm/page.h> 30#include <asm/page.h>
31#include <asm/unistd.h> 31#include <asm/unistd.h>
32 32
diff --git a/arch/m68knommu/kernel/sys_m68k.c b/arch/m68knommu/kernel/sys_m68k.c
index 15d62c5279a9..65f7a95f056e 100644
--- a/arch/m68knommu/kernel/sys_m68k.c
+++ b/arch/m68knommu/kernel/sys_m68k.c
@@ -18,13 +18,13 @@
18#include <linux/mman.h> 18#include <linux/mman.h>
19#include <linux/file.h> 19#include <linux/file.h>
20#include <linux/utsname.h> 20#include <linux/utsname.h>
21#include <linux/ipc.h>
21#include <linux/fs.h> 22#include <linux/fs.h>
22 23
23#include <asm/setup.h> 24#include <asm/setup.h>
24#include <asm/uaccess.h> 25#include <asm/uaccess.h>
25#include <asm/cachectl.h> 26#include <asm/cachectl.h>
26#include <asm/traps.h> 27#include <asm/traps.h>
27#include <asm/ipc.h>
28#include <asm/cacheflush.h> 28#include <asm/cacheflush.h>
29#include <asm/unistd.h> 29#include <asm/unistd.h>
30 30
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index d6e01215fb2b..2b8ec1102e86 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -35,12 +35,12 @@
35#include <linux/security.h> 35#include <linux/security.h>
36#include <linux/compat.h> 36#include <linux/compat.h>
37#include <linux/vfs.h> 37#include <linux/vfs.h>
38#include <linux/ipc.h>
38 39
39#include <net/sock.h> 40#include <net/sock.h>
40#include <net/scm.h> 41#include <net/scm.h>
41 42
42#include <asm/compat-signal.h> 43#include <asm/compat-signal.h>
43#include <asm/ipc.h>
44#include <asm/sim.h> 44#include <asm/sim.h>
45#include <asm/uaccess.h> 45#include <asm/uaccess.h>
46#include <asm/mmu_context.h> 46#include <asm/mmu_context.h>
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index 17c4374d2209..b95fe93dd646 100644
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -28,11 +28,11 @@
28#include <linux/shm.h> 28#include <linux/shm.h>
29#include <linux/compiler.h> 29#include <linux/compiler.h>
30#include <linux/module.h> 30#include <linux/module.h>
31#include <linux/ipc.h>
31 32
32#include <asm/branch.h> 33#include <asm/branch.h>
33#include <asm/cachectl.h> 34#include <asm/cachectl.h>
34#include <asm/cacheflush.h> 35#include <asm/cacheflush.h>
35#include <asm/ipc.h>
36#include <asm/asm-offsets.h> 36#include <asm/asm-offsets.h>
37#include <asm/signal.h> 37#include <asm/signal.h>
38#include <asm/sim.h> 38#include <asm/sim.h>
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index bd85b5fd08c8..4a4f5c6b560b 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -41,10 +41,10 @@
41#include <linux/compat.h> 41#include <linux/compat.h>
42#include <linux/ptrace.h> 42#include <linux/ptrace.h>
43#include <linux/elf.h> 43#include <linux/elf.h>
44#include <linux/ipc.h>
44 45
45#include <asm/ptrace.h> 46#include <asm/ptrace.h>
46#include <asm/types.h> 47#include <asm/types.h>
47#include <asm/ipc.h>
48#include <asm/uaccess.h> 48#include <asm/uaccess.h>
49#include <asm/unistd.h> 49#include <asm/unistd.h>
50#include <asm/semaphore.h> 50#include <asm/semaphore.h>
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index f85f402ceaef..3b1d5dd65643 100644
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
@@ -38,7 +38,6 @@
38#include <linux/personality.h> 38#include <linux/personality.h>
39 39
40#include <asm/uaccess.h> 40#include <asm/uaccess.h>
41#include <asm/ipc.h>
42#include <asm/semaphore.h> 41#include <asm/semaphore.h>
43#include <asm/syscalls.h> 42#include <asm/syscalls.h>
44#include <asm/time.h> 43#include <asm/time.h>
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 5236fdb17fcb..50b85d07ddd2 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -58,9 +58,9 @@
58#include <linux/vfs.h> 58#include <linux/vfs.h>
59#include <linux/ptrace.h> 59#include <linux/ptrace.h>
60#include <linux/fadvise.h> 60#include <linux/fadvise.h>
61#include <linux/ipc.h>
61 62
62#include <asm/types.h> 63#include <asm/types.h>
63#include <asm/ipc.h>
64#include <asm/uaccess.h> 64#include <asm/uaccess.h>
65#include <asm/semaphore.h> 65#include <asm/semaphore.h>
66 66
diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c
index 1eaff84a1eb6..fefee99f28aa 100644
--- a/arch/s390/kernel/sys_s390.c
+++ b/arch/s390/kernel/sys_s390.c
@@ -28,9 +28,9 @@
28#include <linux/utsname.h> 28#include <linux/utsname.h>
29#include <linux/personality.h> 29#include <linux/personality.h>
30#include <linux/unistd.h> 30#include <linux/unistd.h>
31#include <linux/ipc.h>
31 32
32#include <asm/uaccess.h> 33#include <asm/uaccess.h>
33#include <asm/ipc.h>
34 34
35/* 35/*
36 * sys_pipe() is the normal C calling standard for creating 36 * sys_pipe() is the normal C calling standard for creating
diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c
index 024ce5dedd8c..d545a686a201 100644
--- a/arch/sh/kernel/sys_sh.c
+++ b/arch/sh/kernel/sys_sh.c
@@ -22,9 +22,9 @@
22#include <linux/utsname.h> 22#include <linux/utsname.h>
23#include <linux/module.h> 23#include <linux/module.h>
24#include <linux/fs.h> 24#include <linux/fs.h>
25#include <linux/ipc.h>
25#include <asm/cacheflush.h> 26#include <asm/cacheflush.h>
26#include <asm/uaccess.h> 27#include <asm/uaccess.h>
27#include <asm/ipc.h>
28#include <asm/unistd.h> 28#include <asm/unistd.h>
29 29
30/* 30/*
diff --git a/arch/sh64/kernel/sys_sh64.c b/arch/sh64/kernel/sys_sh64.c
index b7f18e298a20..de0a303ba26f 100644
--- a/arch/sh64/kernel/sys_sh64.c
+++ b/arch/sh64/kernel/sys_sh64.c
@@ -29,8 +29,8 @@
29#include <linux/file.h> 29#include <linux/file.h>
30#include <linux/utsname.h> 30#include <linux/utsname.h>
31#include <linux/syscalls.h> 31#include <linux/syscalls.h>
32#include <linux/ipc.h>
32#include <asm/uaccess.h> 33#include <asm/uaccess.h>
33#include <asm/ipc.h>
34#include <asm/ptrace.h> 34#include <asm/ptrace.h>
35#include <asm/unistd.h> 35#include <asm/unistd.h>
36 36
diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c
index a954a0c00000..6c0221e9a9f5 100644
--- a/arch/sparc/kernel/sys_sparc.c
+++ b/arch/sparc/kernel/sys_sparc.c
@@ -21,9 +21,9 @@
21#include <linux/utsname.h> 21#include <linux/utsname.h>
22#include <linux/smp.h> 22#include <linux/smp.h>
23#include <linux/smp_lock.h> 23#include <linux/smp_lock.h>
24#include <linux/ipc.h>
24 25
25#include <asm/uaccess.h> 26#include <asm/uaccess.h>
26#include <asm/ipc.h>
27#include <asm/unistd.h> 27#include <asm/unistd.h>
28 28
29/* #define DEBUG_UNIMP_SYSCALL */ 29/* #define DEBUG_UNIMP_SYSCALL */
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
index 0d5c50264945..560cb1edb1d0 100644
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
@@ -26,7 +26,6 @@
26#include <linux/random.h> 26#include <linux/random.h>
27 27
28#include <asm/uaccess.h> 28#include <asm/uaccess.h>
29#include <asm/ipc.h>
30#include <asm/utrap.h> 29#include <asm/utrap.h>
31#include <asm/perfctr.h> 30#include <asm/perfctr.h>
32#include <asm/a.out.h> 31#include <asm/a.out.h>
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index e8dce90d05d4..78caff926737 100644
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -54,7 +54,6 @@
54#include <linux/highuid.h> 54#include <linux/highuid.h>
55 55
56#include <asm/types.h> 56#include <asm/types.h>
57#include <asm/ipc.h>
58#include <asm/uaccess.h> 57#include <asm/uaccess.h>
59#include <asm/fpumacro.h> 58#include <asm/fpumacro.h>
60#include <asm/semaphore.h> 59#include <asm/semaphore.h>
diff --git a/arch/sparc64/solaris/ipc.c b/arch/sparc64/solaris/ipc.c
index a531a2cdb381..499135fa7060 100644
--- a/arch/sparc64/solaris/ipc.c
+++ b/arch/sparc64/solaris/ipc.c
@@ -11,10 +11,10 @@
11#include <linux/shm.h> 11#include <linux/shm.h>
12#include <linux/sem.h> 12#include <linux/sem.h>
13#include <linux/msg.h> 13#include <linux/msg.h>
14#include <linux/ipc.h>
14 15
15#include <asm/uaccess.h> 16#include <asm/uaccess.h>
16#include <asm/string.h> 17#include <asm/string.h>
17#include <asm/ipc.h>
18 18
19#include "conv.h" 19#include "conv.h"
20 20
diff --git a/arch/um/sys-i386/syscalls.c b/arch/um/sys-i386/syscalls.c
index 710d5fb807e1..e2d142684412 100644
--- a/arch/um/sys-i386/syscalls.c
+++ b/arch/um/sys-i386/syscalls.c
@@ -5,7 +5,7 @@
5 5
6#include "linux/sched.h" 6#include "linux/sched.h"
7#include "linux/shm.h" 7#include "linux/shm.h"
8#include "asm/ipc.h" 8#include "linux/ipc.h"
9#include "asm/mman.h" 9#include "asm/mman.h"
10#include "asm/uaccess.h" 10#include "asm/uaccess.h"
11#include "asm/unistd.h" 11#include "asm/unistd.h"
diff --git a/arch/v850/kernel/syscalls.c b/arch/v850/kernel/syscalls.c
index f9f00ccf5324..0a4df4d6e05f 100644
--- a/arch/v850/kernel/syscalls.c
+++ b/arch/v850/kernel/syscalls.c
@@ -30,7 +30,6 @@
30#include <linux/file.h> 30#include <linux/file.h>
31 31
32#include <asm/uaccess.h> 32#include <asm/uaccess.h>
33#include <asm/ipc.h>
34#include <asm/semaphore.h> 33#include <asm/semaphore.h>
35#include <asm/unistd.h> 34#include <asm/unistd.h>
36 35
diff --git a/arch/x86/ia32/ipc32.c b/arch/x86/ia32/ipc32.c
index 2e1869ec4db4..7b3342e5aab5 100644
--- a/arch/x86/ia32/ipc32.c
+++ b/arch/x86/ia32/ipc32.c
@@ -9,8 +9,6 @@
9#include <linux/ipc.h> 9#include <linux/ipc.h>
10#include <linux/compat.h> 10#include <linux/compat.h>
11 11
12#include <asm/ipc.h>
13
14asmlinkage long 12asmlinkage long
15sys32_ipc(u32 call, int first, int second, int third, 13sys32_ipc(u32 call, int first, int second, int third,
16 compat_uptr_t ptr, u32 fifth) 14 compat_uptr_t ptr, u32 fifth)
diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
index f8bae9ba0324..a86d26f036e1 100644
--- a/arch/x86/kernel/sys_i386_32.c
+++ b/arch/x86/kernel/sys_i386_32.c
@@ -17,10 +17,10 @@
17#include <linux/mman.h> 17#include <linux/mman.h>
18#include <linux/file.h> 18#include <linux/file.h>
19#include <linux/utsname.h> 19#include <linux/utsname.h>
20#include <linux/ipc.h>
20 21
21#include <asm/uaccess.h> 22#include <asm/uaccess.h>
22#include <asm/unistd.h> 23#include <asm/unistd.h>
23#include <asm/ipc.h>
24 24
25/* 25/*
26 * sys_pipe() is the normal C calling standard for creating 26 * sys_pipe() is the normal C calling standard for creating
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
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 */
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
13header-y += socket.h 13header-y += socket.h
14header-y += termbits.h 14header-y += termbits.h
15header-y += fcntl.h 15header-y += fcntl.h
16header-y += ipc.h
17header-y += poll.h 16header-y += poll.h
18header-y += sockios.h 17header-y += sockios.h
19header-y += ucontext.h 18header-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
10header-y += bpp.h 10header-y += bpp.h
11header-y += display7seg.h 11header-y += display7seg.h
12header-y += envctrl.h 12header-y += envctrl.h
13header-y += ipc.h
14header-y += openprom.h 13header-y += openprom.h
15header-y += openpromio.h 14header-y += openpromio.h
16header-y += pconf.h 15header-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 */
57struct 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>