mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -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
|
|
@ -161,17 +161,6 @@ asmlinkage unsigned long sys_mmap(unsigned long addr, unsigned long len,
|
|||
}
|
||||
}
|
||||
|
||||
long sys_shmat_wrapper(int shmid, char __user *shmaddr, int shmflag)
|
||||
{
|
||||
unsigned long raddr;
|
||||
int r;
|
||||
|
||||
r = do_shmat(shmid, shmaddr, shmflag, &raddr);
|
||||
if (r < 0)
|
||||
return r;
|
||||
return raddr;
|
||||
}
|
||||
|
||||
/* Fucking broken ABI */
|
||||
|
||||
#ifdef CONFIG_64BIT
|
||||
|
|
|
|||
|
|
@ -297,7 +297,7 @@
|
|||
ENTRY_DIFF(msgrcv)
|
||||
ENTRY_SAME(msgget) /* 190 */
|
||||
ENTRY_SAME(msgctl)
|
||||
ENTRY_SAME(shmat_wrapper)
|
||||
ENTRY_SAME(shmat)
|
||||
ENTRY_SAME(shmdt)
|
||||
ENTRY_SAME(shmget)
|
||||
ENTRY_SAME(shmctl) /* 195 */
|
||||
|
|
|
|||
Loading…
Reference in a new issue