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>
2007-10-16 23:29:24 -07:00 · 2007-10-16 23:29:24 -07:00 · cba4fbbff2
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@ -26,9 +26,9 @@
 #include <linux/fs.h>
 #include <linux/file.h>
 #include <linux/utsname.h>
+#include <linux/ipc.h>

 #include <asm/uaccess.h>
-#include <asm/ipc.h>

 extern unsigned long do_mremap(unsigned long addr, unsigned long old_len,
 			       unsigned long new_len, unsigned long flags,
--- a/arch/arm/kernel/sys_oabi-compat.c
+++ b/arch/arm/kernel/sys_oabi-compat.c
@ -80,7 +80,7 @@
 #include <linux/sem.h>
 #include <linux/socket.h>
 #include <linux/net.h>
-#include <asm/ipc.h>
+#include <linux/ipc.h>
 #include <asm/uaccess.h>

 struct oldabi_stat64 {
--- a/arch/cris/kernel/sys_cris.c
+++ b/arch/cris/kernel/sys_cris.c
@ -21,9 +21,9 @@
 #include <linux/stat.h>
 #include <linux/mman.h>
 #include <linux/file.h>
+#include <linux/ipc.h>

 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 #include <asm/segment.h>

 /*
--- a/arch/frv/kernel/sys_frv.c
+++ b/arch/frv/kernel/sys_frv.c
@ -23,10 +23,10 @@
 #include <linux/file.h>
 #include <linux/utsname.h>
 #include <linux/syscalls.h>
+#include <linux/ipc.h>

 #include <asm/setup.h>
 #include <asm/uaccess.h>
-#include <asm/ipc.h>

 /*
 * sys_pipe() is the normal C calling standard for creating
--- a/arch/h8300/kernel/sys_h8300.c
+++ b/arch/h8300/kernel/sys_h8300.c
@ -19,12 +19,12 @@
 #include <linux/file.h>
 #include <linux/utsname.h>
 #include <linux/fs.h>
+#include <linux/ipc.h>

 #include <asm/setup.h>
 #include <asm/uaccess.h>
 #include <asm/cachectl.h>
 #include <asm/traps.h>
-#include <asm/ipc.h>
 #include <asm/unistd.h>

 /*
--- a/arch/m32r/kernel/sys_m32r.c
+++ b/arch/m32r/kernel/sys_m32r.c
@ -20,11 +20,11 @@
 #include <linux/mman.h>
 #include <linux/file.h>
 #include <linux/utsname.h>
+#include <linux/ipc.h>

 #include <asm/uaccess.h>
 #include <asm/cachectl.h>
 #include <asm/cacheflush.h>
-#include <asm/ipc.h>
 #include <asm/syscall.h>
 #include <asm/unistd.h>

--- a/arch/m68k/kernel/sys_m68k.c
+++ b/arch/m68k/kernel/sys_m68k.c
@ -21,12 +21,12 @@
 #include <linux/mman.h>
 #include <linux/file.h>
 #include <linux/utsname.h>
+#include <linux/ipc.h>

 #include <asm/setup.h>
 #include <asm/uaccess.h>
 #include <asm/cachectl.h>
 #include <asm/traps.h>
-#include <asm/ipc.h>
 #include <asm/page.h>
 #include <asm/unistd.h>

--- a/arch/m68knommu/kernel/sys_m68k.c
+++ b/arch/m68knommu/kernel/sys_m68k.c
@ -18,13 +18,13 @@
 #include <linux/mman.h>
 #include <linux/file.h>
 #include <linux/utsname.h>
+#include <linux/ipc.h>
 #include <linux/fs.h>

 #include <asm/setup.h>
 #include <asm/uaccess.h>
 #include <asm/cachectl.h>
 #include <asm/traps.h>
-#include <asm/ipc.h>
 #include <asm/cacheflush.h>
 #include <asm/unistd.h>

--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@ -35,12 +35,12 @@
 #include <linux/security.h>
 #include <linux/compat.h>
 #include <linux/vfs.h>
+#include <linux/ipc.h>

 #include <net/sock.h>
 #include <net/scm.h>

 #include <asm/compat-signal.h>
-#include <asm/ipc.h>
 #include <asm/sim.h>
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@ -28,11 +28,11 @@
 #include <linux/shm.h>
 #include <linux/compiler.h>
 #include <linux/module.h>
+#include <linux/ipc.h>

 #include <asm/branch.h>
 #include <asm/cachectl.h>
 #include <asm/cacheflush.h>
-#include <asm/ipc.h>
 #include <asm/asm-offsets.h>
 #include <asm/signal.h>
 #include <asm/sim.h>
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@ -41,10 +41,10 @@
 #include <linux/compat.h>
 #include <linux/ptrace.h>
 #include <linux/elf.h>
+#include <linux/ipc.h>

 #include <asm/ptrace.h>
 #include <asm/types.h>
-#include <asm/ipc.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 #include <asm/semaphore.h>
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
@ -38,7 +38,6 @@
 #include <linux/personality.h>

 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 #include <asm/semaphore.h>
 #include <asm/syscalls.h>
 #include <asm/time.h>
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@ -58,9 +58,9 @@
 #include <linux/vfs.h>
 #include <linux/ptrace.h>
 #include <linux/fadvise.h>
+#include <linux/ipc.h>

 #include <asm/types.h>
-#include <asm/ipc.h>
 #include <asm/uaccess.h>
 #include <asm/semaphore.h>

--- a/arch/s390/kernel/sys_s390.c
+++ b/arch/s390/kernel/sys_s390.c
@ -28,9 +28,9 @@
 #include <linux/utsname.h>
 #include <linux/personality.h>
 #include <linux/unistd.h>
+#include <linux/ipc.h>

 #include <asm/uaccess.h>
-#include <asm/ipc.h>

 /*
 * sys_pipe() is the normal C calling standard for creating
--- a/arch/sh/kernel/sys_sh.c
+++ b/arch/sh/kernel/sys_sh.c
@ -22,9 +22,9 @@
 #include <linux/utsname.h>
 #include <linux/module.h>
 #include <linux/fs.h>
+#include <linux/ipc.h>
 #include <asm/cacheflush.h>
 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 #include <asm/unistd.h>

 /*
--- a/arch/sh64/kernel/sys_sh64.c
+++ b/arch/sh64/kernel/sys_sh64.c
@ -29,8 +29,8 @@
 #include <linux/file.h>
 #include <linux/utsname.h>
 #include <linux/syscalls.h>
+#include <linux/ipc.h>
 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 #include <asm/ptrace.h>
 #include <asm/unistd.h>

--- a/arch/sparc/kernel/sys_sparc.c
+++ b/arch/sparc/kernel/sys_sparc.c
@ -21,9 +21,9 @@
 #include <linux/utsname.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
+#include <linux/ipc.h>

 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 #include <asm/unistd.h>

 /* #define DEBUG_UNIMP_SYSCALL */
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
@ -26,7 +26,6 @@
 #include <linux/random.h>

 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 #include <asm/utrap.h>
 #include <asm/perfctr.h>
 #include <asm/a.out.h>
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@ -54,7 +54,6 @@
 #include <linux/highuid.h>

 #include <asm/types.h>
-#include <asm/ipc.h>
 #include <asm/uaccess.h>
 #include <asm/fpumacro.h>
 #include <asm/semaphore.h>
--- a/arch/sparc64/solaris/ipc.c
+++ b/arch/sparc64/solaris/ipc.c
@ -11,10 +11,10 @@
 #include <linux/shm.h>
 #include <linux/sem.h>
 #include <linux/msg.h>
+#include <linux/ipc.h>

 #include <asm/uaccess.h>
 #include <asm/string.h>
-#include <asm/ipc.h>

 #include "conv.h"

--- a/arch/um/sys-i386/syscalls.c
+++ b/arch/um/sys-i386/syscalls.c
@ -5,7 +5,7 @@

 #include "linux/sched.h"
 #include "linux/shm.h"
-#include "asm/ipc.h"
+#include "linux/ipc.h"
 #include "asm/mman.h"
 #include "asm/uaccess.h"
 #include "asm/unistd.h"
--- a/arch/v850/kernel/syscalls.c
+++ b/arch/v850/kernel/syscalls.c
@ -30,7 +30,6 @@
 #include <linux/file.h>

 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 #include <asm/semaphore.h>
 #include <asm/unistd.h>

--- a/arch/x86/ia32/ipc32.c
+++ b/arch/x86/ia32/ipc32.c
@ -9,8 +9,6 @@
 #include <linux/ipc.h>
 #include <linux/compat.h>

-#include <asm/ipc.h>
-
 asmlinkage long
 sys32_ipc(u32 call, int first, int second, int third,
 		compat_uptr_t ptr, u32 fifth)
--- a/arch/x86/kernel/sys_i386_32.c
+++ b/arch/x86/kernel/sys_i386_32.c
@ -17,10 +17,10 @@
 #include <linux/mman.h>
 #include <linux/file.h>
 #include <linux/utsname.h>
+#include <linux/ipc.h>

 #include <asm/uaccess.h>
 #include <asm/unistd.h>
-#include <asm/ipc.h>

 /*
 * sys_pipe() is the normal C calling standard for creating
--- a/include/asm-arm/ipc.h
+++ b/include/asm-arm/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-blackfin/ipc.h
+++ b/include/asm-blackfin/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-cris/ipc.h
+++ b/include/asm-cris/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-frv/ipc.h
+++ b/include/asm-frv/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
@ -2,7 +2,6 @@ header-y += errno-base.h
 header-y += errno.h
 header-y += fcntl.h
 header-y += ioctl.h
-header-y += ipc.h
 header-y += mman.h
 header-y += poll.h
 header-y += signal.h
--- a/include/asm-generic/ipc.h
+++ b/include/asm-generic/ipc.h
@ -1,31 +0,0 @@
-#ifndef _ASM_GENERIC_IPC_H
-#define _ASM_GENERIC_IPC_H
-/*
- * 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))
-
-#endif	/* _ASM_GENERIC_IPC_H */
--- a/include/asm-h8300/ipc.h
+++ b/include/asm-h8300/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-m32r/ipc.h
+++ b/include/asm-m32r/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-m68k/ipc.h
+++ b/include/asm-m68k/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-m68knommu/ipc.h
+++ b/include/asm-m68knommu/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-mips/ipc.h
+++ b/include/asm-mips/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-powerpc/Kbuild
+++ b/include/asm-powerpc/Kbuild
@ -13,7 +13,6 @@ header-y += shmbuf.h
 header-y += socket.h
 header-y += termbits.h
 header-y += fcntl.h
-header-y += ipc.h
 header-y += poll.h
 header-y += sockios.h
 header-y += ucontext.h
--- a/include/asm-powerpc/ipc.h
+++ b/include/asm-powerpc/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-s390/ipc.h
+++ b/include/asm-s390/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-sh/ipc.h
+++ b/include/asm-sh/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-sh64/ipc.h
+++ b/include/asm-sh64/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-sparc/ipc.h
+++ b/include/asm-sparc/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-sparc64/Kbuild
+++ b/include/asm-sparc64/Kbuild
@ -10,7 +10,6 @@ header-y += bbc.h
 header-y += bpp.h
 header-y += display7seg.h
 header-y += envctrl.h
-header-y += ipc.h
 header-y += openprom.h
 header-y += openpromio.h
 header-y += pconf.h
--- a/include/asm-sparc64/ipc.h
+++ b/include/asm-sparc64/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-um/ipc.h
+++ b/include/asm-um/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-v850/ipc.h
+++ b/include/asm-v850/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/asm-x86/ipc.h
+++ b/include/asm-x86/ipc.h
@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/include/linux/ipc.h
+++ b/include/linux/ipc.h
@ -49,6 +49,34 @@ 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>