Commit 59ab844e authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Torvalds
Browse files

compat: remove some compat entry points 

These are all handled correctly when calling the native system call entry
point, so remove the special cases.

Link: https://lkml.kernel.org/r/20210727144859.4150043-6-arnd@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Feng Tang <feng.tang@intel.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e130242d

arch/arm64/include/asm/unistd32.h

+5 −5
Original line number Diff line number Diff line
@@ -649,11 +649,11 @@ __SYSCALL(__NR_inotify_add_watch, sys_inotify_add_watch) 
#define __NR_inotify_rm_watch 318

__SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch)

#define __NR_mbind 319

__SYSCALL(__NR_mbind, compat_sys_mbind)

__SYSCALL(__NR_mbind, sys_mbind)

#define __NR_get_mempolicy 320

__SYSCALL(__NR_get_mempolicy, compat_sys_get_mempolicy)

__SYSCALL(__NR_get_mempolicy, sys_get_mempolicy)

#define __NR_set_mempolicy 321

__SYSCALL(__NR_set_mempolicy, compat_sys_set_mempolicy)

__SYSCALL(__NR_set_mempolicy, sys_set_mempolicy)

#define __NR_openat 322

__SYSCALL(__NR_openat, compat_sys_openat)

#define __NR_mkdirat 323
@@ -699,7 +699,7 @@ __SYSCALL(__NR_tee, sys_tee) 
#define __NR_vmsplice 343

__SYSCALL(__NR_vmsplice, sys_vmsplice)

#define __NR_move_pages 344

__SYSCALL(__NR_move_pages, compat_sys_move_pages)

__SYSCALL(__NR_move_pages, sys_move_pages)

#define __NR_getcpu 345

__SYSCALL(__NR_getcpu, sys_getcpu)

#define __NR_epoll_pwait 346
@@ -811,7 +811,7 @@ __SYSCALL(__NR_rseq, sys_rseq) 
#define __NR_io_pgetevents 399

__SYSCALL(__NR_io_pgetevents, compat_sys_io_pgetevents)

#define __NR_migrate_pages 400

__SYSCALL(__NR_migrate_pages, compat_sys_migrate_pages)

__SYSCALL(__NR_migrate_pages, sys_migrate_pages)

#define __NR_kexec_file_load 401

__SYSCALL(__NR_kexec_file_load, sys_kexec_file_load)

/* 402 is unused */

arch/mips/kernel/syscalls/syscall_n32.tbl

+5 −5
Original line number Diff line number Diff line
@@ -239,9 +239,9 @@ 
228	n32	clock_nanosleep			sys_clock_nanosleep_time32

229	n32	tgkill				sys_tgkill

230	n32	utimes				sys_utimes_time32

231	n32	mbind				compat_sys_mbind

232	n32	get_mempolicy			compat_sys_get_mempolicy

233	n32	set_mempolicy			compat_sys_set_mempolicy

231	n32	mbind				sys_mbind

232	n32	get_mempolicy			sys_get_mempolicy

233	n32	set_mempolicy			sys_set_mempolicy

234	n32	mq_open				compat_sys_mq_open

235	n32	mq_unlink			sys_mq_unlink

236	n32	mq_timedsend			sys_mq_timedsend_time32
@@ -258,7 +258,7 @@ 
247	n32	inotify_init			sys_inotify_init

248	n32	inotify_add_watch		sys_inotify_add_watch

249	n32	inotify_rm_watch		sys_inotify_rm_watch

250	n32	migrate_pages			compat_sys_migrate_pages

250	n32	migrate_pages			sys_migrate_pages

251	n32	openat				sys_openat

252	n32	mkdirat				sys_mkdirat

253	n32	mknodat				sys_mknodat
@@ -279,7 +279,7 @@ 
268	n32	sync_file_range			sys_sync_file_range

269	n32	tee				sys_tee

270	n32	vmsplice			sys_vmsplice

271	n32	move_pages			compat_sys_move_pages

271	n32	move_pages			sys_move_pages

272	n32	set_robust_list			compat_sys_set_robust_list

273	n32	get_robust_list			compat_sys_get_robust_list

274	n32	kexec_load			compat_sys_kexec_load

arch/mips/kernel/syscalls/syscall_o32.tbl

+5 −5
Original line number Diff line number Diff line
@@ -279,9 +279,9 @@ 
265	o32	clock_nanosleep			sys_clock_nanosleep_time32

266	o32	tgkill				sys_tgkill

267	o32	utimes				sys_utimes_time32

268	o32	mbind				sys_mbind			compat_sys_mbind

269	o32	get_mempolicy			sys_get_mempolicy		compat_sys_get_mempolicy

270	o32	set_mempolicy			sys_set_mempolicy		compat_sys_set_mempolicy

268	o32	mbind				sys_mbind

269	o32	get_mempolicy			sys_get_mempolicy

270	o32	set_mempolicy			sys_set_mempolicy

271	o32	mq_open				sys_mq_open			compat_sys_mq_open

272	o32	mq_unlink			sys_mq_unlink

273	o32	mq_timedsend			sys_mq_timedsend_time32
@@ -298,7 +298,7 @@ 
284	o32	inotify_init			sys_inotify_init

285	o32	inotify_add_watch		sys_inotify_add_watch

286	o32	inotify_rm_watch		sys_inotify_rm_watch

287	o32	migrate_pages			sys_migrate_pages		compat_sys_migrate_pages

287	o32	migrate_pages			sys_migrate_pages

288	o32	openat				sys_openat			compat_sys_openat

289	o32	mkdirat				sys_mkdirat

290	o32	mknodat				sys_mknodat
@@ -319,7 +319,7 @@ 
305	o32	sync_file_range			sys_sync_file_range		sys32_sync_file_range

306	o32	tee				sys_tee

307	o32	vmsplice			sys_vmsplice

308	o32	move_pages			sys_move_pages			compat_sys_move_pages

308	o32	move_pages			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

311	o32	kexec_load			sys_kexec_load			compat_sys_kexec_load

arch/parisc/kernel/syscalls/syscall.tbl

+4 −4
Original line number Diff line number Diff line
@@ -292,9 +292,9 @@ 
258	32	clock_nanosleep		sys_clock_nanosleep_time32

258	64	clock_nanosleep		sys_clock_nanosleep

259	common	tgkill			sys_tgkill

260	common	mbind			sys_mbind			compat_sys_mbind

261	common	get_mempolicy		sys_get_mempolicy		compat_sys_get_mempolicy

262	common	set_mempolicy		sys_set_mempolicy		compat_sys_set_mempolicy

260	common	mbind			sys_mbind

261	common	get_mempolicy		sys_get_mempolicy

262	common	set_mempolicy		sys_set_mempolicy

# 263 was vserver

264	common	add_key			sys_add_key

265	common	request_key		sys_request_key
@@ -331,7 +331,7 @@ 
292	64	sync_file_range		sys_sync_file_range

293	common	tee			sys_tee

294	common	vmsplice		sys_vmsplice

295	common	move_pages		sys_move_pages			compat_sys_move_pages

295	common	move_pages		sys_move_pages

296	common	getcpu			sys_getcpu

297	common	epoll_pwait		sys_epoll_pwait			compat_sys_epoll_pwait

298	common	statfs64		sys_statfs64			compat_sys_statfs64

arch/powerpc/kernel/syscalls/syscall.tbl

+5 −5
Original line number Diff line number Diff line
@@ -330,10 +330,10 @@ 
256	64	sys_debug_setcontext		sys_ni_syscall

256	spu	sys_debug_setcontext		sys_ni_syscall

# 257 reserved for vserver

258	nospu	migrate_pages			sys_migrate_pages		compat_sys_migrate_pages

259	nospu	mbind				sys_mbind			compat_sys_mbind

260	nospu	get_mempolicy			sys_get_mempolicy		compat_sys_get_mempolicy

261	nospu	set_mempolicy			sys_set_mempolicy		compat_sys_set_mempolicy

258	nospu	migrate_pages			sys_migrate_pages

259	nospu	mbind				sys_mbind

260	nospu	get_mempolicy			sys_get_mempolicy

261	nospu	set_mempolicy			sys_set_mempolicy

262	nospu	mq_open				sys_mq_open			compat_sys_mq_open

263	nospu	mq_unlink			sys_mq_unlink

264	32	mq_timedsend			sys_mq_timedsend_time32
@@ -381,7 +381,7 @@ 
298	common	faccessat			sys_faccessat

299	common	get_robust_list			sys_get_robust_list		compat_sys_get_robust_list

300	common	set_robust_list			sys_set_robust_list		compat_sys_set_robust_list

301	common	move_pages			sys_move_pages			compat_sys_move_pages

301	common	move_pages			sys_move_pages

302	common	getcpu				sys_getcpu

303	nospu	epoll_pwait			sys_epoll_pwait			compat_sys_epoll_pwait

304	32	utimensat			sys_utimensat_time32