diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-05-01 11:59:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 11:59:12 -0400 |
commit | 7d87e14c236d6c4cab66d87cf0bc1e0f0375d308 (patch) | |
tree | 0c0826cdc102286b541e3e56b59c81752d34c90d /arch/um/sys-x86_64 | |
parent | 434498d5323445b59167fd7aa5633b74ebbce901 (diff) |
[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')
-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 @@ | |||
14 | #include "asm/prctl.h" /* XXX This should get the constants from libc */ | 14 | #include "asm/prctl.h" /* XXX This should get the constants from libc */ |
15 | #include "choose-mode.h" | 15 | #include "choose-mode.h" |
16 | 16 | ||
17 | /* XXX: copied from x86-64: arch/x86_64/kernel/sys_x86_64.c */ | ||
18 | asmlinkage long wrap_sys_shmat(int shmid, char __user *shmaddr, int shmflg) | ||
19 | { | ||
20 | unsigned long raddr; | ||
21 | |||
22 | return do_shmat(shmid, shmaddr, shmflg, &raddr) ?: (long) raddr; | ||
23 | } | ||
24 | |||
25 | asmlinkage long sys_uname64(struct new_utsname __user * name) | 17 | asmlinkage long sys_uname64(struct new_utsname __user * name) |
26 | { | 18 | { |
27 | int err; | 19 | int err; |