leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove include/asm-*/ipc.h

Browse Source 
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>
This commit is contained in:
Adrian Bunk 2007-10-16 23:29:24 -07:00 committed by Linus Torvalds
parent 4af3c9cc4f
commit cba4fbbff2
47 changed files with 47 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/kernel/sys_arm.c
View File

@ -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,

2
arch/arm/kernel/sys_oabi-compat.c
View File

@ -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 {

2
arch/cris/kernel/sys_cris.c
View File

@ -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>
/*

2
arch/frv/kernel/sys_frv.c
View File

@ -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

2
arch/h8300/kernel/sys_h8300.c
View File

@ -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>
/*

2
arch/m32r/kernel/sys_m32r.c
View File

@ -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>

2
arch/m68k/kernel/sys_m68k.c
View File

@ -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>

2
arch/m68knommu/kernel/sys_m68k.c
View File

@ -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>

2
arch/mips/kernel/linux32.c
View File

@ -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>

2
arch/mips/kernel/syscall.c
View File

@ -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>

2
arch/powerpc/kernel/sys_ppc32.c
View File

@ -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>

1
arch/powerpc/kernel/syscalls.c
View File

@ -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>

2
arch/s390/kernel/compat_linux.c
View File

@ -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>

2
arch/s390/kernel/sys_s390.c
View File

@ -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

2
arch/sh/kernel/sys_sh.c
View File

@ -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>
/*

2
arch/sh64/kernel/sys_sh64.c
View File

@ -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>

2
arch/sparc/kernel/sys_sparc.c
View File

@ -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 */

1
arch/sparc64/kernel/sys_sparc.c
View File

@ -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>

1
arch/sparc64/kernel/sys_sparc32.c
View File

@ -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>

2
arch/sparc64/solaris/ipc.c
View File

@ -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"

2
arch/um/sys-i386/syscalls.c
View File

@ -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"

1
arch/v850/kernel/syscalls.c
View File

@ -30,7 +30,6 @@
#include <linux/file.h>
#include <asm/uaccess.h>
#include <asm/ipc.h>
#include <asm/semaphore.h>
#include <asm/unistd.h>

2
arch/x86/ia32/ipc32.c
View File

@ -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)

2
arch/x86/kernel/sys_i386_32.c
View File

@ -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

1
include/asm-arm/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-blackfin/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-cris/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-frv/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-generic/Kbuild
View File

@ -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

31
include/asm-generic/ipc.h
View File

@ -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 */

1
include/asm-h8300/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-m32r/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-m68k/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-m68knommu/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-mips/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-powerpc/Kbuild
View File

@ -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

1
include/asm-powerpc/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-s390/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-sh/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-sh64/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-sparc/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-sparc64/Kbuild
View File

@ -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

1
include/asm-sparc64/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-um/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-v850/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

1
include/asm-x86/ipc.h
View File

@ -1 +0,0 @@
#include <asm-generic/ipc.h>

28
include/linux/ipc.h
View File

@ -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>