From cba4fbbff2e9722e93b28e18fa7714b9013cbdda Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 16 Oct 2007 23:29:24 -0700 Subject: [PATCH] remove include/asm-*/ipc.h All asm/ipc.h files do only #include . 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 Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/arm/kernel/sys_arm.c | 2 +- arch/arm/kernel/sys_oabi-compat.c | 2 +- arch/cris/kernel/sys_cris.c | 2 +- arch/frv/kernel/sys_frv.c | 2 +- arch/h8300/kernel/sys_h8300.c | 2 +- arch/m32r/kernel/sys_m32r.c | 2 +- arch/m68k/kernel/sys_m68k.c | 2 +- arch/m68knommu/kernel/sys_m68k.c | 2 +- arch/mips/kernel/linux32.c | 2 +- arch/mips/kernel/syscall.c | 2 +- arch/powerpc/kernel/sys_ppc32.c | 2 +- arch/powerpc/kernel/syscalls.c | 1 - arch/s390/kernel/compat_linux.c | 2 +- arch/s390/kernel/sys_s390.c | 2 +- arch/sh/kernel/sys_sh.c | 2 +- arch/sh64/kernel/sys_sh64.c | 2 +- arch/sparc/kernel/sys_sparc.c | 2 +- arch/sparc64/kernel/sys_sparc.c | 1 - arch/sparc64/kernel/sys_sparc32.c | 1 - arch/sparc64/solaris/ipc.c | 2 +- arch/um/sys-i386/syscalls.c | 2 +- arch/v850/kernel/syscalls.c | 1 - arch/x86/ia32/ipc32.c | 2 -- arch/x86/kernel/sys_i386_32.c | 2 +- include/asm-arm/ipc.h | 1 - include/asm-blackfin/ipc.h | 1 - include/asm-cris/ipc.h | 1 - include/asm-frv/ipc.h | 1 - include/asm-generic/Kbuild | 1 - include/asm-generic/ipc.h | 31 ------------------------------- include/asm-h8300/ipc.h | 1 - include/asm-m32r/ipc.h | 1 - include/asm-m68k/ipc.h | 1 - include/asm-m68knommu/ipc.h | 1 - include/asm-mips/ipc.h | 1 - include/asm-powerpc/Kbuild | 1 - include/asm-powerpc/ipc.h | 1 - include/asm-s390/ipc.h | 1 - include/asm-sh/ipc.h | 1 - include/asm-sh64/ipc.h | 1 - include/asm-sparc/ipc.h | 1 - include/asm-sparc64/Kbuild | 1 - include/asm-sparc64/ipc.h | 1 - include/asm-um/ipc.h | 1 - include/asm-v850/ipc.h | 1 - include/asm-x86/ipc.h | 1 - include/linux/ipc.h | 28 ++++++++++++++++++++++++++++ 47 files changed, 47 insertions(+), 77 deletions(-) delete mode 100644 include/asm-arm/ipc.h delete mode 100644 include/asm-blackfin/ipc.h delete mode 100644 include/asm-cris/ipc.h delete mode 100644 include/asm-frv/ipc.h delete mode 100644 include/asm-generic/ipc.h delete mode 100644 include/asm-h8300/ipc.h delete mode 100644 include/asm-m32r/ipc.h delete mode 100644 include/asm-m68k/ipc.h delete mode 100644 include/asm-m68knommu/ipc.h delete mode 100644 include/asm-mips/ipc.h delete mode 100644 include/asm-powerpc/ipc.h delete mode 100644 include/asm-s390/ipc.h delete mode 100644 include/asm-sh/ipc.h delete mode 100644 include/asm-sh64/ipc.h delete mode 100644 include/asm-sparc/ipc.h delete mode 100644 include/asm-sparc64/ipc.h delete mode 100644 include/asm-um/ipc.h delete mode 100644 include/asm-v850/ipc.h delete mode 100644 include/asm-x86/ipc.h diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c index 4d25e49a14..9bd1870d98 100644 --- a/arch/arm/kernel/sys_arm.c +++ b/arch/arm/kernel/sys_arm.c @@ -26,9 +26,9 @@ #include #include #include +#include #include -#include extern unsigned long do_mremap(unsigned long addr, unsigned long old_len, 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 8e2f9bc336..e8b9804689 100644 --- a/arch/arm/kernel/sys_oabi-compat.c +++ b/arch/arm/kernel/sys_oabi-compat.c @@ -80,7 +80,7 @@ #include #include #include -#include +#include #include struct oldabi_stat64 { diff --git a/arch/cris/kernel/sys_cris.c b/arch/cris/kernel/sys_cris.c index 0aa0e0ebb3..514359b812 100644 --- a/arch/cris/kernel/sys_cris.c +++ b/arch/cris/kernel/sys_cris.c @@ -21,9 +21,9 @@ #include #include #include +#include #include -#include #include /* diff --git a/arch/frv/kernel/sys_frv.c b/arch/frv/kernel/sys_frv.c index 6fbe2665c5..04c6b1677c 100644 --- a/arch/frv/kernel/sys_frv.c +++ b/arch/frv/kernel/sys_frv.c @@ -23,10 +23,10 @@ #include #include #include +#include #include #include -#include /* * 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 ddc62727dc..00608be6d5 100644 --- a/arch/h8300/kernel/sys_h8300.c +++ b/arch/h8300/kernel/sys_h8300.c @@ -19,12 +19,12 @@ #include #include #include +#include #include #include #include #include -#include #include /* diff --git a/arch/m32r/kernel/sys_m32r.c b/arch/m32r/kernel/sys_m32r.c index b13dbbeaea..0fc2efec18 100644 --- a/arch/m32r/kernel/sys_m32r.c +++ b/arch/m32r/kernel/sys_m32r.c @@ -20,11 +20,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c index 36d78cf1a7..e892f17ba3 100644 --- a/arch/m68k/kernel/sys_m68k.c +++ b/arch/m68k/kernel/sys_m68k.c @@ -21,12 +21,12 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/arch/m68knommu/kernel/sys_m68k.c b/arch/m68knommu/kernel/sys_m68k.c index 15d62c5279..65f7a95f05 100644 --- a/arch/m68knommu/kernel/sys_m68k.c +++ b/arch/m68knommu/kernel/sys_m68k.c @@ -18,13 +18,13 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index d6e01215fb..2b8ec1102e 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c @@ -35,12 +35,12 @@ #include #include #include +#include #include #include #include -#include #include #include #include diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c index 17c4374d22..b95fe93dd6 100644 --- a/arch/mips/kernel/syscall.c +++ b/arch/mips/kernel/syscall.c @@ -28,11 +28,11 @@ #include #include #include +#include #include #include #include -#include #include #include #include diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c index bd85b5fd08..4a4f5c6b56 100644 --- a/arch/powerpc/kernel/sys_ppc32.c +++ b/arch/powerpc/kernel/sys_ppc32.c @@ -41,10 +41,10 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c index f85f402cea..3b1d5dd656 100644 --- a/arch/powerpc/kernel/syscalls.c +++ b/arch/powerpc/kernel/syscalls.c @@ -38,7 +38,6 @@ #include #include -#include #include #include #include diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c index 5236fdb17f..50b85d07dd 100644 --- a/arch/s390/kernel/compat_linux.c +++ b/arch/s390/kernel/compat_linux.c @@ -58,9 +58,9 @@ #include #include #include +#include #include -#include #include #include diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c index 1eaff84a1e..fefee99f28 100644 --- a/arch/s390/kernel/sys_s390.c +++ b/arch/s390/kernel/sys_s390.c @@ -28,9 +28,9 @@ #include #include #include +#include #include -#include /* * 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 024ce5dedd..d545a686a2 100644 --- a/arch/sh/kernel/sys_sh.c +++ b/arch/sh/kernel/sys_sh.c @@ -22,9 +22,9 @@ #include #include #include +#include #include #include -#include #include /* diff --git a/arch/sh64/kernel/sys_sh64.c b/arch/sh64/kernel/sys_sh64.c index b7f18e298a..de0a303ba2 100644 --- a/arch/sh64/kernel/sys_sh64.c +++ b/arch/sh64/kernel/sys_sh64.c @@ -29,8 +29,8 @@ #include #include #include +#include #include -#include #include #include diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c index a954a0c000..6c0221e9a9 100644 --- a/arch/sparc/kernel/sys_sparc.c +++ b/arch/sparc/kernel/sys_sparc.c @@ -21,9 +21,9 @@ #include #include #include +#include #include -#include #include /* #define DEBUG_UNIMP_SYSCALL */ diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c index 0d5c502649..560cb1edb1 100644 --- a/arch/sparc64/kernel/sys_sparc.c +++ b/arch/sparc64/kernel/sys_sparc.c @@ -26,7 +26,6 @@ #include #include -#include #include #include #include diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c index e8dce90d05..78caff9267 100644 --- a/arch/sparc64/kernel/sys_sparc32.c +++ b/arch/sparc64/kernel/sys_sparc32.c @@ -54,7 +54,6 @@ #include #include -#include #include #include #include diff --git a/arch/sparc64/solaris/ipc.c b/arch/sparc64/solaris/ipc.c index a531a2cdb3..499135fa70 100644 --- a/arch/sparc64/solaris/ipc.c +++ b/arch/sparc64/solaris/ipc.c @@ -11,10 +11,10 @@ #include #include #include +#include #include #include -#include #include "conv.h" diff --git a/arch/um/sys-i386/syscalls.c b/arch/um/sys-i386/syscalls.c index 710d5fb807..e2d1426844 100644 --- 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" diff --git a/arch/v850/kernel/syscalls.c b/arch/v850/kernel/syscalls.c index f9f00ccf53..0a4df4d6e0 100644 --- a/arch/v850/kernel/syscalls.c +++ b/arch/v850/kernel/syscalls.c @@ -30,7 +30,6 @@ #include #include -#include #include #include diff --git a/arch/x86/ia32/ipc32.c b/arch/x86/ia32/ipc32.c index 2e1869ec4d..7b3342e5aa 100644 --- a/arch/x86/ia32/ipc32.c +++ b/arch/x86/ia32/ipc32.c @@ -9,8 +9,6 @@ #include #include -#include - asmlinkage long sys32_ipc(u32 call, int first, int second, int third, 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 f8bae9ba03..a86d26f036 100644 --- a/arch/x86/kernel/sys_i386_32.c +++ b/arch/x86/kernel/sys_i386_32.c @@ -17,10 +17,10 @@ #include #include #include +#include #include #include -#include /* * 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 a46e3d9c2a..0000000000 --- a/include/asm-arm/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-blackfin/ipc.h b/include/asm-blackfin/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-blackfin/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-cris/ipc.h b/include/asm-cris/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-cris/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-frv/ipc.h b/include/asm-frv/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-frv/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild index 5bfeef7616..c18110ee30 100644 --- 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 diff --git a/include/asm-generic/ipc.h b/include/asm-generic/ipc.h deleted file mode 100644 index a40407a165..0000000000 --- a/include/asm-generic/ipc.h +++ /dev/null @@ -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 */ diff --git a/include/asm-h8300/ipc.h b/include/asm-h8300/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-h8300/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-m32r/ipc.h b/include/asm-m32r/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-m32r/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-m68k/ipc.h b/include/asm-m68k/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-m68k/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-m68knommu/ipc.h b/include/asm-m68knommu/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-m68knommu/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-mips/ipc.h b/include/asm-mips/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-mips/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-powerpc/Kbuild b/include/asm-powerpc/Kbuild index 626212c0fd..5f640e5424 100644 --- 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 diff --git a/include/asm-powerpc/ipc.h b/include/asm-powerpc/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-powerpc/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-s390/ipc.h b/include/asm-s390/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-s390/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sh/ipc.h b/include/asm-sh/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-sh/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sh64/ipc.h b/include/asm-sh64/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-sh64/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc/ipc.h b/include/asm-sparc/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-sparc/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild index 854fd3a65a..a90dc82129 100644 --- 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 diff --git a/include/asm-sparc64/ipc.h b/include/asm-sparc64/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-sparc64/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-um/ipc.h b/include/asm-um/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-um/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-v850/ipc.h b/include/asm-v850/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-v850/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-x86/ipc.h b/include/asm-x86/ipc.h deleted file mode 100644 index a46e3d9c2a..0000000000 --- a/include/asm-x86/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/linux/ipc.h b/include/linux/ipc.h index 3fd3ddd5f0..ee11183409 100644 --- 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 -- 2.39.5