aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh64/kernel/sys_sh64.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-05-01 08:59:12 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-01 08:59:12 -0700
commit7d87e14c236d6c4cab66d87cf0bc1e0f0375d308 (patch)
tree0c0826cdc102286b541e3e56b59c81752d34c90d /arch/sh64/kernel/sys_sh64.c
parent434498d5323445b59167fd7aa5633b74ebbce901 (diff)
downloadkernel_samsung_smdk4412-7d87e14c236d6c4cab66d87cf0bc1e0f0375d308.zip
kernel_samsung_smdk4412-7d87e14c236d6c4cab66d87cf0bc1e0f0375d308.tar.gz
kernel_samsung_smdk4412-7d87e14c236d6c4cab66d87cf0bc1e0f0375d308.tar.bz2
[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/sh64/kernel/sys_sh64.c')
-rw-r--r--arch/sh64/kernel/sys_sh64.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/sh64/kernel/sys_sh64.c b/arch/sh64/kernel/sys_sh64.c
index 4546845..58ff7d5 100644
--- a/arch/sh64/kernel/sys_sh64.c
+++ b/arch/sh64/kernel/sys_sh64.c
@@ -283,18 +283,3 @@ asmlinkage int sys_uname(struct old_utsname * name)
up_read(&uts_sem);
return err?-EFAULT:0;
}
-
-/* Copy from mips version */
-asmlinkage long sys_shmatcall(int shmid, char __user *shmaddr,
- int shmflg)
-{
- unsigned long raddr;
- int err;
-
- err = do_shmat(shmid, shmaddr, shmflg, &raddr);
- if (err)
- return err;
-
- err = raddr;
- return err;
-}