Commit 9aa0dfe1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sockopt-cleanups' 



Christoph Hellwig says:

====================
sockopt cleanups

this series cleans up various lose ends in the sockopt code, most
importantly removing the compat_{get,set}sockopt infrastructure in favor
of just using in_compat_syscall() in the few places that care.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 089377b7 a44d9e72

arch/arm64/include/asm/unistd32.h

+2 −2
Original line number Diff line number Diff line
@@ -599,9 +599,9 @@ __SYSCALL(__NR_recvfrom, compat_sys_recvfrom) 
#define __NR_shutdown 293

__SYSCALL(__NR_shutdown, sys_shutdown)

#define __NR_setsockopt 294

__SYSCALL(__NR_setsockopt, compat_sys_setsockopt)

__SYSCALL(__NR_setsockopt, sys_setsockopt)

#define __NR_getsockopt 295

__SYSCALL(__NR_getsockopt, compat_sys_getsockopt)

__SYSCALL(__NR_getsockopt, sys_getsockopt)

#define __NR_sendmsg 296

__SYSCALL(__NR_sendmsg, compat_sys_sendmsg)

#define __NR_recvmsg 297

arch/mips/kernel/syscalls/syscall_n32.tbl

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ 
50	n32	getsockname			sys_getsockname

51	n32	getpeername			sys_getpeername

52	n32	socketpair			sys_socketpair

53	n32	setsockopt			compat_sys_setsockopt

54	n32	getsockopt			compat_sys_getsockopt

53	n32	setsockopt			sys_setsockopt

54	n32	getsockopt			sys_getsockopt

55	n32	clone				__sys_clone

56	n32	fork				__sys_fork

57	n32	execve				compat_sys_execve

arch/mips/kernel/syscalls/syscall_o32.tbl

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ 
170	o32	connect				sys_connect

171	o32	getpeername			sys_getpeername

172	o32	getsockname			sys_getsockname

173	o32	getsockopt			sys_getsockopt			compat_sys_getsockopt

173	o32	getsockopt			sys_getsockopt			sys_getsockopt

174	o32	listen				sys_listen

175	o32	recv				sys_recv			compat_sys_recv

176	o32	recvfrom			sys_recvfrom			compat_sys_recvfrom
@@ -192,7 +192,7 @@ 
178	o32	send				sys_send

179	o32	sendmsg				sys_sendmsg			compat_sys_sendmsg

180	o32	sendto				sys_sendto

181	o32	setsockopt			sys_setsockopt			compat_sys_setsockopt

181	o32	setsockopt			sys_setsockopt			sys_setsockopt

182	o32	shutdown			sys_shutdown

183	o32	socket				sys_socket

184	o32	socketpair			sys_socketpair

arch/parisc/kernel/syscalls/syscall.tbl

+2 −2
Original line number Diff line number Diff line
@@ -198,8 +198,8 @@ 
178	common	rt_sigqueueinfo		sys_rt_sigqueueinfo		compat_sys_rt_sigqueueinfo

179	common	rt_sigsuspend		sys_rt_sigsuspend		compat_sys_rt_sigsuspend

180	common	chown			sys_chown

181	common	setsockopt		sys_setsockopt			compat_sys_setsockopt

182	common	getsockopt		sys_getsockopt			compat_sys_getsockopt

181	common	setsockopt		sys_setsockopt			sys_setsockopt

182	common	getsockopt		sys_getsockopt			sys_getsockopt

183	common	sendmsg			sys_sendmsg			compat_sys_sendmsg

184	common	recvmsg			sys_recvmsg			compat_sys_recvmsg

185	common	semop			sys_semop

arch/powerpc/kernel/syscalls/syscall.tbl

+2 −2
Original line number Diff line number Diff line
@@ -433,8 +433,8 @@ 
336	common	recv				sys_recv			compat_sys_recv

337	common	recvfrom			sys_recvfrom			compat_sys_recvfrom

338	common	shutdown			sys_shutdown

339	common	setsockopt			sys_setsockopt			compat_sys_setsockopt

340	common	getsockopt			sys_getsockopt			compat_sys_getsockopt

339	common	setsockopt			sys_setsockopt			sys_setsockopt

340	common	getsockopt			sys_getsockopt			sys_getsockopt

341	common	sendmsg				sys_sendmsg			compat_sys_sendmsg

342	common	recvmsg				sys_recvmsg			compat_sys_recvmsg

343	32	recvmmsg			sys_recvmmsg_time32		compat_sys_recvmmsg_time32

CRA Git | Maintained and supported by SUSTech CRA and CCSE