[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
@@ -457,22 +457,6 @@ osf_getdomainname(char __user *name, int namelen)
|
||||
return 0;
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
osf_shmat(int shmid, void __user *shmaddr, int shmflg)
|
||||
{
|
||||
unsigned long raddr;
|
||||
long err;
|
||||
|
||||
err = do_shmat(shmid, shmaddr, shmflg, &raddr);
|
||||
|
||||
/*
|
||||
* This works because all user-level addresses are
|
||||
* non-negative longs!
|
||||
*/
|
||||
return err ? err : (long)raddr;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* The following stuff should move into a header file should it ever
|
||||
* be labeled "officially supported." Right now, there is just enough
|
||||
|
@@ -227,7 +227,7 @@ sys_call_table:
|
||||
.quad sys_semop
|
||||
.quad osf_utsname
|
||||
.quad sys_lchown
|
||||
.quad osf_shmat
|
||||
.quad sys_shmat
|
||||
.quad sys_shmctl /* 210 */
|
||||
.quad sys_shmdt
|
||||
.quad sys_shmget
|
||||
|
Reference in New Issue
Block a user