mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
[PATCH] consolidate sys_shmat
Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
434498d532
commit
7d87e14c23
17 changed files with 21 additions and 106 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue