diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-05-01 17:59:12 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 17:59:12 +0200 |
| commit | 7d87e14c236d6c4cab66d87cf0bc1e0f0375d308 (patch) | |
| tree | 0c0826cdc102286b541e3e56b59c81752d34c90d /arch/um/sys-x86_64/syscalls.c | |
| parent | [PATCH] sn_console: make sal_console_uart static again (diff) | |
| download | linux-7d87e14c236d6c4cab66d87cf0bc1e0f0375d308.tar.xz linux-7d87e14c236d6c4cab66d87cf0bc1e0f0375d308.zip | |
[PATCH] consolidate sys_shmat
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/sys-x86_64/syscalls.c')
| -rw-r--r-- | arch/um/sys-x86_64/syscalls.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/um/sys-x86_64/syscalls.c b/arch/um/sys-x86_64/syscalls.c index 15768c96ceb4..ab4b0abf8af3 100644 --- a/arch/um/sys-x86_64/syscalls.c +++ b/arch/um/sys-x86_64/syscalls.c @@ -14,14 +14,6 @@ #include "asm/prctl.h" /* XXX This should get the constants from libc */ #include "choose-mode.h" -/* XXX: copied from x86-64: arch/x86_64/kernel/sys_x86_64.c */ -asmlinkage long wrap_sys_shmat(int shmid, char __user *shmaddr, int shmflg) -{ - unsigned long raddr; - - return do_shmat(shmid, shmaddr, shmflg, &raddr) ?: (long) raddr; -} - asmlinkage long sys_uname64(struct new_utsname __user * name) { int err; |