Commit 7d87e14c authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

[PATCH] consolidate sys_shmat 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 434498d5

arch/alpha/kernel/osf_sys.c

+0 −16
Original line number Diff line number Diff line
@@ -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

arch/alpha/kernel/systbls.S

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/kernel/sys_arm.c

+0 −12
Original line number Diff line number Diff line
@@ -227,18 +227,6 @@ asmlinkage int sys_ipc(uint call, int first, int second, int third, 
	}

}



asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg,

			  unsigned long __user *addr)

{

	unsigned long ret;

	long err;



	err = do_shmat(shmid, shmaddr, shmflg, &ret);

	if (err == 0)

		err = put_user(ret, addr);

	return err;

}



/* Fork a new task - this creates a new program thread.

 * This is called indirectly via a small wrapper

 */

arch/ia64/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/ia64/kernel/sys_ia64.c

+0 −14
Original line number Diff line number Diff line
@@ -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)

{