[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
@@ -1417,7 +1417,7 @@ sys_call_table:
|
||||
data8 sys_msgrcv
|
||||
data8 sys_msgctl
|
||||
data8 sys_shmget
|
||||
data8 ia64_shmat
|
||||
data8 sys_shmat
|
||||
data8 sys_shmdt // 1115
|
||||
data8 sys_shmctl
|
||||
data8 sys_syslog
|
||||
|
@@ -92,20 +92,6 @@ sys_getpagesize (void)
|
||||
return PAGE_SIZE;
|
||||
}
|
||||
|
||||
asmlinkage unsigned long
|
||||
ia64_shmat (int shmid, void __user *shmaddr, int shmflg)
|
||||
{
|
||||
unsigned long raddr;
|
||||
int retval;
|
||||
|
||||
retval = do_shmat(shmid, shmaddr, shmflg, &raddr);
|
||||
if (retval < 0)
|
||||
return retval;
|
||||
|
||||
force_successful_syscall_return();
|
||||
return raddr;
|
||||
}
|
||||
|
||||
asmlinkage unsigned long
|
||||
ia64_brk (unsigned long brk)
|
||||
{
|
||||
|
Reference in New Issue
Block a user