Commit 85ed13e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull compat iovec cleanups from Al Viro:
 "Christoph's series around import_iovec() and compat variant thereof"

* 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  security/keys: remove compat_keyctl_instantiate_key_iov
  mm: remove compat_process_vm_{readv,writev}
  fs: remove compat_sys_vmsplice
  fs: remove the compat readv/writev syscalls
  fs: remove various compat readv/writev helpers
  iov_iter: transparently handle compat iovecs in import_iovec
  iov_iter: refactor rw_copy_check_uvector and import_iovec
  iov_iter: move rw_copy_check_uvector() into lib/iov_iter.c
  compat.h: fix a spelling error in <linux/compat.h>
parents c9057836 5d47b394

arch/arm64/include/asm/unistd32.h

+5 −5
Original line number Diff line number Diff line
@@ -301,9 +301,9 @@ __SYSCALL(__NR_flock, sys_flock) 
#define __NR_msync 144

__SYSCALL(__NR_msync, sys_msync)

#define __NR_readv 145

__SYSCALL(__NR_readv, compat_sys_readv)

__SYSCALL(__NR_readv, sys_readv)

#define __NR_writev 146

__SYSCALL(__NR_writev, compat_sys_writev)

__SYSCALL(__NR_writev, sys_writev)

#define __NR_getsid 147

__SYSCALL(__NR_getsid, sys_getsid)

#define __NR_fdatasync 148
@@ -697,7 +697,7 @@ __SYSCALL(__NR_sync_file_range2, compat_sys_aarch32_sync_file_range2) 
#define __NR_tee 342

__SYSCALL(__NR_tee, sys_tee)

#define __NR_vmsplice 343

__SYSCALL(__NR_vmsplice, compat_sys_vmsplice)

__SYSCALL(__NR_vmsplice, sys_vmsplice)

#define __NR_move_pages 344

__SYSCALL(__NR_move_pages, compat_sys_move_pages)

#define __NR_getcpu 345
@@ -763,9 +763,9 @@ __SYSCALL(__NR_sendmmsg, compat_sys_sendmmsg) 
#define __NR_setns 375

__SYSCALL(__NR_setns, sys_setns)

#define __NR_process_vm_readv 376

__SYSCALL(__NR_process_vm_readv, compat_sys_process_vm_readv)

__SYSCALL(__NR_process_vm_readv, sys_process_vm_readv)

#define __NR_process_vm_writev 377

__SYSCALL(__NR_process_vm_writev, compat_sys_process_vm_writev)

__SYSCALL(__NR_process_vm_writev, sys_process_vm_writev)

#define __NR_kcmp 378

__SYSCALL(__NR_kcmp, sys_kcmp)

#define __NR_finit_module 379

arch/mips/kernel/syscalls/syscall_n32.tbl

+5 −5
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
15	n32	ioctl				compat_sys_ioctl

16	n32	pread64				sys_pread64

17	n32	pwrite64			sys_pwrite64

18	n32	readv				compat_sys_readv

19	n32	writev				compat_sys_writev

18	n32	readv				sys_readv

19	n32	writev				sys_writev

20	n32	access				sys_access

21	n32	pipe				sysm_pipe

22	n32	_newselect			compat_sys_select
@@ -278,7 +278,7 @@ 
267	n32	splice				sys_splice

268	n32	sync_file_range			sys_sync_file_range

269	n32	tee				sys_tee

270	n32	vmsplice			compat_sys_vmsplice

270	n32	vmsplice			sys_vmsplice

271	n32	move_pages			compat_sys_move_pages

272	n32	set_robust_list			compat_sys_set_robust_list

273	n32	get_robust_list			compat_sys_get_robust_list
@@ -317,8 +317,8 @@ 
306	n32	syncfs				sys_syncfs

307	n32	sendmmsg			compat_sys_sendmmsg

308	n32	setns				sys_setns

309	n32	process_vm_readv		compat_sys_process_vm_readv

310	n32	process_vm_writev		compat_sys_process_vm_writev

309	n32	process_vm_readv		sys_process_vm_readv

310	n32	process_vm_writev		sys_process_vm_writev

311	n32	kcmp				sys_kcmp

312	n32	finit_module			sys_finit_module

313	n32	sched_setattr			sys_sched_setattr

arch/mips/kernel/syscalls/syscall_o32.tbl

+5 −5
Original line number Diff line number Diff line
@@ -156,8 +156,8 @@ 
142	o32	_newselect			sys_select			compat_sys_select

143	o32	flock				sys_flock

144	o32	msync				sys_msync

145	o32	readv				sys_readv			compat_sys_readv

146	o32	writev				sys_writev			compat_sys_writev

145	o32	readv				sys_readv

146	o32	writev				sys_writev

147	o32	cacheflush			sys_cacheflush

148	o32	cachectl			sys_cachectl

149	o32	sysmips				__sys_sysmips
@@ -318,7 +318,7 @@ 
304	o32	splice				sys_splice

305	o32	sync_file_range			sys_sync_file_range		sys32_sync_file_range

306	o32	tee				sys_tee

307	o32	vmsplice			sys_vmsplice			compat_sys_vmsplice

307	o32	vmsplice			sys_vmsplice

308	o32	move_pages			sys_move_pages			compat_sys_move_pages

309	o32	set_robust_list			sys_set_robust_list		compat_sys_set_robust_list

310	o32	get_robust_list			sys_get_robust_list		compat_sys_get_robust_list
@@ -356,8 +356,8 @@ 
342	o32	syncfs				sys_syncfs

343	o32	sendmmsg			sys_sendmmsg			compat_sys_sendmmsg

344	o32	setns				sys_setns

345	o32	process_vm_readv		sys_process_vm_readv		compat_sys_process_vm_readv

346	o32	process_vm_writev		sys_process_vm_writev		compat_sys_process_vm_writev

345	o32	process_vm_readv		sys_process_vm_readv

346	o32	process_vm_writev		sys_process_vm_writev

347	o32	kcmp				sys_kcmp

348	o32	finit_module			sys_finit_module

349	o32	sched_setattr			sys_sched_setattr

arch/parisc/kernel/syscalls/syscall.tbl

+5 −5
Original line number Diff line number Diff line
@@ -159,8 +159,8 @@ 
142	common	_newselect		sys_select			compat_sys_select

143	common	flock			sys_flock

144	common	msync			sys_msync

145	common	readv			sys_readv			compat_sys_readv

146	common	writev			sys_writev			compat_sys_writev

145	common	readv			sys_readv

146	common	writev			sys_writev

147	common	getsid			sys_getsid

148	common	fdatasync		sys_fdatasync

149	common	_sysctl			sys_ni_syscall
@@ -330,7 +330,7 @@ 
292	32	sync_file_range		parisc_sync_file_range

292	64	sync_file_range		sys_sync_file_range

293	common	tee			sys_tee

294	common	vmsplice		sys_vmsplice			compat_sys_vmsplice

294	common	vmsplice		sys_vmsplice

295	common	move_pages		sys_move_pages			compat_sys_move_pages

296	common	getcpu			sys_getcpu

297	common	epoll_pwait		sys_epoll_pwait			compat_sys_epoll_pwait
@@ -372,8 +372,8 @@ 
327	common	syncfs			sys_syncfs

328	common	setns			sys_setns

329	common	sendmmsg		sys_sendmmsg			compat_sys_sendmmsg

330	common	process_vm_readv	sys_process_vm_readv		compat_sys_process_vm_readv

331	common	process_vm_writev	sys_process_vm_writev		compat_sys_process_vm_writev

330	common	process_vm_readv	sys_process_vm_readv

331	common	process_vm_writev	sys_process_vm_writev

332	common	kcmp			sys_kcmp

333	common	finit_module		sys_finit_module

334	common	sched_setattr		sys_sched_setattr

arch/powerpc/kernel/syscalls/syscall.tbl

+5 −5
Original line number Diff line number Diff line
@@ -193,8 +193,8 @@ 
142	common	_newselect			sys_select			compat_sys_select

143	common	flock				sys_flock

144	common	msync				sys_msync

145	common	readv				sys_readv			compat_sys_readv

146	common	writev				sys_writev			compat_sys_writev

145	common	readv				sys_readv

146	common	writev				sys_writev

147	common	getsid				sys_getsid

148	common	fdatasync			sys_fdatasync

149	nospu	_sysctl				sys_ni_syscall
@@ -369,7 +369,7 @@ 
282	common	unshare				sys_unshare

283	common	splice				sys_splice

284	common	tee				sys_tee

285	common	vmsplice			sys_vmsplice			compat_sys_vmsplice

285	common	vmsplice			sys_vmsplice

286	common	openat				sys_openat			compat_sys_openat

287	common	mkdirat				sys_mkdirat

288	common	mknodat				sys_mknodat
@@ -449,8 +449,8 @@ 
348	common	syncfs				sys_syncfs

349	common	sendmmsg			sys_sendmmsg			compat_sys_sendmmsg

350	common	setns				sys_setns

351	nospu	process_vm_readv		sys_process_vm_readv		compat_sys_process_vm_readv

352	nospu	process_vm_writev		sys_process_vm_writev		compat_sys_process_vm_writev

351	nospu	process_vm_readv		sys_process_vm_readv

352	nospu	process_vm_writev		sys_process_vm_writev

353	nospu	finit_module			sys_finit_module

354	nospu	kcmp				sys_kcmp

355	common	sched_setattr			sys_sched_setattr

CRA Git | Maintained and supported by SUSTech CRA and CCSE