Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b51d3cdf authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

x86: remove compat_sys_x86_waitpid() 



compat_sys_x86_waitpid() is not needed, as it takes the same parameters
(int, *int, int) as the native syscall.

Suggested-by: default avatarAl Viro <viro@ZenIV.linux.org.uk>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: x86@kernel.org
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 37db219e

arch/x86/entry/syscalls/syscall_32.tbl

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
4	i386	write			sys_write

5	i386	open			sys_open			compat_sys_open

6	i386	close			sys_close

7	i386	waitpid			sys_waitpid			compat_sys_x86_waitpid

7	i386	waitpid			sys_waitpid

8	i386	creat			sys_creat

9	i386	link			sys_link

10	i386	unlink			sys_unlink

arch/x86/ia32/sys_ia32.c

+0 −6
Original line number Diff line number Diff line
@@ -169,12 +169,6 @@ COMPAT_SYSCALL_DEFINE1(x86_mmap, struct mmap_arg_struct32 __user *, arg) 
			       a.offset>>PAGE_SHIFT);

}



COMPAT_SYSCALL_DEFINE3(x86_waitpid, compat_pid_t, pid, unsigned int __user *,

		       stat_addr, int, options)

{

	return compat_sys_wait4(pid, stat_addr, options, NULL);

}



/* warning: next two assume little endian */

COMPAT_SYSCALL_DEFINE5(x86_pread, unsigned int, fd, char __user *, ubuf,

		       u32, count, u32, poslo, u32, poshi)

arch/x86/include/asm/sys_ia32.h

+0 −3
Original line number Diff line number Diff line
@@ -35,9 +35,6 @@ asmlinkage long compat_sys_x86_fstatat(unsigned int, const char __user *, 
struct mmap_arg_struct32;

asmlinkage long compat_sys_x86_mmap(struct mmap_arg_struct32 __user *);



asmlinkage long compat_sys_x86_waitpid(compat_pid_t, unsigned int __user *,

				       int);



asmlinkage long compat_sys_x86_pread(unsigned int, char __user *, u32, u32,

				     u32);

asmlinkage long compat_sys_x86_pwrite(unsigned int, const char __user *, u32,