[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>
This commit is contained in:

committed by
Linus Torvalds

parent
434498d532
commit
7d87e14c23
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user