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

Commit 00bf25d6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

y2038: use time32 syscall names on 32-bit 



This is the big flip, where all 32-bit architectures set COMPAT_32BIT_TIME
and use the _time32 system calls from the former compat layer instead
of the system calls that take __kernel_timespec and similar arguments.

The temporary redirects for __kernel_timespec, __kernel_itimerspec
and __kernel_timex can get removed with this.

It would be easy to split this commit by architecture, but with the new
generated system call tables, it's easy enough to do it all at once,
which makes it a little easier to check that the changes are the same
in each table.

Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 8dabe724

arch/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ config 64BIT_TIME 
	  handling.



config COMPAT_32BIT_TIME

	def_bool (!64BIT && 64BIT_TIME) || COMPAT

	def_bool !64BIT || COMPAT

	help

	  This enables 32 bit time_t support in addition to 64 bit time_t support.

	  This is relevant on all 32-bit architectures, and 64-bit architectures

arch/arm/kernel/sys_oabi-compat.c

+4 −4
Original line number Diff line number Diff line
@@ -317,10 +317,10 @@ struct oabi_sembuf { 
asmlinkage long sys_oabi_semtimedop(int semid,

				    struct oabi_sembuf __user *tsops,

				    unsigned nsops,

				    const struct timespec __user *timeout)

				    const struct old_timespec32 __user *timeout)

{

	struct sembuf *sops;

	struct timespec local_timeout;

	struct old_timespec32 local_timeout;

	long err;

	int i;
@@ -350,7 +350,7 @@ asmlinkage long sys_oabi_semtimedop(int semid, 
	} else {

		mm_segment_t fs = get_fs();

		set_fs(KERNEL_DS);

		err = sys_semtimedop(semid, sops, nsops, timeout);

		err = sys_semtimedop_time32(semid, sops, nsops, timeout);

		set_fs(fs);

	}

	kfree(sops);
@@ -375,7 +375,7 @@ asmlinkage int sys_oabi_ipc(uint call, int first, int second, int third, 
		return  sys_oabi_semtimedop(first,

					    (struct oabi_sembuf __user *)ptr,

					    second,

					    (const struct timespec __user *)fifth);

					    (const struct old_timespec32 __user *)fifth);

	default:

		return sys_ipc(call, first, second, third, ptr, fifth);

	}

arch/arm/tools/syscall.tbl

+23 −23
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ 
121	common	setdomainname		sys_setdomainname

122	common	uname			sys_newuname

# 123 was sys_modify_ldt

124	common	adjtimex		sys_adjtimex

124	common	adjtimex		sys_adjtimex_time32

125	common	mprotect		sys_mprotect

126	common	sigprocmask		sys_sigprocmask

# 127 was sys_create_module
@@ -174,8 +174,8 @@ 
158	common	sched_yield		sys_sched_yield

159	common	sched_get_priority_max	sys_sched_get_priority_max

160	common	sched_get_priority_min	sys_sched_get_priority_min

161	common	sched_rr_get_interval	sys_sched_rr_get_interval

162	common	nanosleep		sys_nanosleep

161	common	sched_rr_get_interval	sys_sched_rr_get_interval_time32

162	common	nanosleep		sys_nanosleep_time32

163	common	mremap			sys_mremap

164	common	setresuid		sys_setresuid16

165	common	getresuid		sys_getresuid16
@@ -190,7 +190,7 @@ 
174	common	rt_sigaction		sys_rt_sigaction

175	common	rt_sigprocmask		sys_rt_sigprocmask

176	common	rt_sigpending		sys_rt_sigpending

177	common	rt_sigtimedwait		sys_rt_sigtimedwait

177	common	rt_sigtimedwait		sys_rt_sigtimedwait_time32

178	common	rt_sigqueueinfo		sys_rt_sigqueueinfo

179	common	rt_sigsuspend		sys_rt_sigsuspend

180	common	pread64			sys_pread64		sys_oabi_pread64
@@ -254,12 +254,12 @@ 
237	common	fremovexattr		sys_fremovexattr

238	common	tkill			sys_tkill

239	common	sendfile64		sys_sendfile64

240	common	futex			sys_futex

240	common	futex			sys_futex_time32

241	common	sched_setaffinity	sys_sched_setaffinity

242	common	sched_getaffinity	sys_sched_getaffinity

243	common	io_setup		sys_io_setup

244	common	io_destroy		sys_io_destroy

245	common	io_getevents		sys_io_getevents

245	common	io_getevents		sys_io_getevents_time32

246	common	io_submit		sys_io_submit

247	common	io_cancel		sys_io_cancel

248	common	exit_group		sys_exit_group
@@ -272,14 +272,14 @@ 
# 255 for get_thread_area

256	common	set_tid_address		sys_set_tid_address

257	common	timer_create		sys_timer_create

258	common	timer_settime		sys_timer_settime

259	common	timer_gettime		sys_timer_gettime

258	common	timer_settime		sys_timer_settime32

259	common	timer_gettime		sys_timer_gettime32

260	common	timer_getoverrun	sys_timer_getoverrun

261	common	timer_delete		sys_timer_delete

262	common	clock_settime		sys_clock_settime

263	common	clock_gettime		sys_clock_gettime

264	common	clock_getres		sys_clock_getres

265	common	clock_nanosleep		sys_clock_nanosleep

262	common	clock_settime		sys_clock_settime32

263	common	clock_gettime		sys_clock_gettime32

264	common	clock_getres		sys_clock_getres_time32

265	common	clock_nanosleep		sys_clock_nanosleep_time32

266	common	statfs64		sys_statfs64_wrapper

267	common	fstatfs64		sys_fstatfs64_wrapper

268	common	tgkill			sys_tgkill
@@ -290,8 +290,8 @@ 
273	common	pciconfig_write		sys_pciconfig_write

274	common	mq_open			sys_mq_open

275	common	mq_unlink		sys_mq_unlink

276	common	mq_timedsend		sys_mq_timedsend

277	common	mq_timedreceive		sys_mq_timedreceive

276	common	mq_timedsend		sys_mq_timedsend_time32

277	common	mq_timedreceive		sys_mq_timedreceive_time32

278	common	mq_notify		sys_mq_notify

279	common	mq_getsetattr		sys_mq_getsetattr

280	common	waitid			sys_waitid
@@ -326,7 +326,7 @@ 
309	common	add_key			sys_add_key

310	common	request_key		sys_request_key

311	common	keyctl			sys_keyctl

312	common	semtimedop		sys_semtimedop		sys_oabi_semtimedop

312	common	semtimedop		sys_semtimedop_time32	sys_oabi_semtimedop

313	common	vserver

314	common	ioprio_set		sys_ioprio_set

315	common	ioprio_get		sys_ioprio_get
@@ -349,8 +349,8 @@ 
332	common	readlinkat		sys_readlinkat

333	common	fchmodat		sys_fchmodat

334	common	faccessat		sys_faccessat

335	common	pselect6		sys_pselect6

336	common	ppoll			sys_ppoll

335	common	pselect6		sys_pselect6_time32

336	common	ppoll			sys_ppoll_time32

337	common	unshare			sys_unshare

338	common	set_robust_list		sys_set_robust_list

339	common	get_robust_list		sys_get_robust_list
@@ -362,13 +362,13 @@ 
345	common	getcpu			sys_getcpu

346	common	epoll_pwait		sys_epoll_pwait

347	common	kexec_load		sys_kexec_load

348	common	utimensat		sys_utimensat

348	common	utimensat		sys_utimensat_time32

349	common	signalfd		sys_signalfd

350	common	timerfd_create		sys_timerfd_create

351	common	eventfd			sys_eventfd

352	common	fallocate		sys_fallocate

353	common	timerfd_settime		sys_timerfd_settime

354	common	timerfd_gettime		sys_timerfd_gettime

353	common	timerfd_settime		sys_timerfd_settime32

354	common	timerfd_gettime		sys_timerfd_gettime32

355	common	signalfd4		sys_signalfd4

356	common	eventfd2		sys_eventfd2

357	common	epoll_create1		sys_epoll_create1
@@ -379,14 +379,14 @@ 
362	common	pwritev			sys_pwritev

363	common	rt_tgsigqueueinfo	sys_rt_tgsigqueueinfo

364	common	perf_event_open		sys_perf_event_open

365	common	recvmmsg		sys_recvmmsg

365	common	recvmmsg		sys_recvmmsg_time32

366	common	accept4			sys_accept4

367	common	fanotify_init		sys_fanotify_init

368	common	fanotify_mark		sys_fanotify_mark

369	common	prlimit64		sys_prlimit64

370	common	name_to_handle_at	sys_name_to_handle_at

371	common	open_by_handle_at	sys_open_by_handle_at

372	common	clock_adjtime		sys_clock_adjtime

372	common	clock_adjtime		sys_clock_adjtime32

373	common	syncfs			sys_syncfs

374	common	sendmmsg		sys_sendmmsg

375	common	setns			sys_setns
@@ -413,6 +413,6 @@ 
396	common	pkey_free		sys_pkey_free

397	common	statx			sys_statx

398	common	rseq			sys_rseq

399	common	io_pgetevents		sys_io_pgetevents

399	common	io_pgetevents		sys_io_pgetevents_time32

400	common	migrate_pages		sys_migrate_pages

401	common	kexec_file_load		sys_kexec_file_load

arch/m68k/kernel/syscalls/syscall.tbl

+21 −21
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ 
121	common	setdomainname			sys_setdomainname

122	common	uname				sys_newuname

123	common	cacheflush			sys_cacheflush

124	common	adjtimex			sys_adjtimex

124	common	adjtimex			sys_adjtimex_time32

125	common	mprotect			sys_mprotect

126	common	sigprocmask			sys_sigprocmask

127	common	create_module			sys_ni_syscall
@@ -168,8 +168,8 @@ 
158	common	sched_yield			sys_sched_yield

159	common	sched_get_priority_max		sys_sched_get_priority_max

160	common	sched_get_priority_min		sys_sched_get_priority_min

161	common	sched_rr_get_interval		sys_sched_rr_get_interval

162	common	nanosleep			sys_nanosleep

161	common	sched_rr_get_interval		sys_sched_rr_get_interval_time32

162	common	nanosleep			sys_nanosleep_time32

163	common	mremap				sys_mremap

164	common	setresuid			sys_setresuid16

165	common	getresuid			sys_getresuid16
@@ -184,7 +184,7 @@ 
174	common	rt_sigaction			sys_rt_sigaction

175	common	rt_sigprocmask			sys_rt_sigprocmask

176	common	rt_sigpending			sys_rt_sigpending

177	common	rt_sigtimedwait			sys_rt_sigtimedwait

177	common	rt_sigtimedwait			sys_rt_sigtimedwait_time32

178	common	rt_sigqueueinfo			sys_rt_sigqueueinfo

179	common	rt_sigsuspend			sys_rt_sigsuspend

180	common	pread64				sys_pread64
@@ -242,7 +242,7 @@ 
232	common	removexattr			sys_removexattr

233	common	lremovexattr			sys_lremovexattr

234	common	fremovexattr			sys_fremovexattr

235	common	futex				sys_futex

235	common	futex				sys_futex_time32

236	common	sendfile64			sys_sendfile64

237	common	mincore				sys_mincore

238	common	madvise				sys_madvise
@@ -250,7 +250,7 @@ 
240	common	readahead			sys_readahead

241	common	io_setup			sys_io_setup

242	common	io_destroy			sys_io_destroy

243	common	io_getevents			sys_io_getevents

243	common	io_getevents			sys_io_getevents_time32

244	common	io_submit			sys_io_submit

245	common	io_cancel			sys_io_cancel

246	common	fadvise64			sys_fadvise64
@@ -262,14 +262,14 @@ 
252	common	remap_file_pages		sys_remap_file_pages

253	common	set_tid_address			sys_set_tid_address

254	common	timer_create			sys_timer_create

255	common	timer_settime			sys_timer_settime

256	common	timer_gettime			sys_timer_gettime

255	common	timer_settime			sys_timer_settime32

256	common	timer_gettime			sys_timer_gettime32

257	common	timer_getoverrun		sys_timer_getoverrun

258	common	timer_delete			sys_timer_delete

259	common	clock_settime			sys_clock_settime

260	common	clock_gettime			sys_clock_gettime

261	common	clock_getres			sys_clock_getres

262	common	clock_nanosleep			sys_clock_nanosleep

259	common	clock_settime			sys_clock_settime32

260	common	clock_gettime			sys_clock_gettime32

261	common	clock_getres			sys_clock_getres_time32

262	common	clock_nanosleep			sys_clock_nanosleep_time32

263	common	statfs64			sys_statfs64

264	common	fstatfs64			sys_fstatfs64

265	common	tgkill				sys_tgkill
@@ -280,8 +280,8 @@ 
270	common	set_mempolicy			sys_set_mempolicy

271	common	mq_open				sys_mq_open

272	common	mq_unlink			sys_mq_unlink

273	common	mq_timedsend			sys_mq_timedsend

274	common	mq_timedreceive			sys_mq_timedreceive

273	common	mq_timedsend			sys_mq_timedsend_time32

274	common	mq_timedreceive			sys_mq_timedreceive_time32

275	common	mq_notify			sys_mq_notify

276	common	mq_getsetattr			sys_mq_getsetattr

277	common	waitid				sys_waitid
@@ -308,8 +308,8 @@ 
298	common	readlinkat			sys_readlinkat

299	common	fchmodat			sys_fchmodat

300	common	faccessat			sys_faccessat

301	common	pselect6			sys_pselect6

302	common	ppoll				sys_ppoll

301	common	pselect6			sys_pselect6_time32

302	common	ppoll				sys_ppoll_time32

303	common	unshare				sys_unshare

304	common	set_robust_list			sys_set_robust_list

305	common	get_robust_list			sys_get_robust_list
@@ -323,13 +323,13 @@ 
313	common	kexec_load			sys_kexec_load

314	common	getcpu				sys_getcpu

315	common	epoll_pwait			sys_epoll_pwait

316	common	utimensat			sys_utimensat

316	common	utimensat			sys_utimensat_time32

317	common	signalfd			sys_signalfd

318	common	timerfd_create			sys_timerfd_create

319	common	eventfd				sys_eventfd

320	common	fallocate			sys_fallocate

321	common	timerfd_settime			sys_timerfd_settime

322	common	timerfd_gettime			sys_timerfd_gettime

321	common	timerfd_settime			sys_timerfd_settime32

322	common	timerfd_gettime			sys_timerfd_gettime32

323	common	signalfd4			sys_signalfd4

324	common	eventfd2			sys_eventfd2

325	common	epoll_create1			sys_epoll_create1
@@ -349,7 +349,7 @@ 
339	common	prlimit64			sys_prlimit64

340	common	name_to_handle_at		sys_name_to_handle_at

341	common	open_by_handle_at		sys_open_by_handle_at

342	common	clock_adjtime			sys_clock_adjtime

342	common	clock_adjtime			sys_clock_adjtime32

343	common	syncfs				sys_syncfs

344	common	setns				sys_setns

345	common	process_vm_readv		sys_process_vm_readv
@@ -378,7 +378,7 @@ 
368	common	recvfrom			sys_recvfrom

369	common	recvmsg				sys_recvmsg

370	common	shutdown			sys_shutdown

371	common	recvmmsg			sys_recvmmsg

371	common	recvmmsg			sys_recvmmsg_time32

372	common	sendmmsg			sys_sendmmsg

373	common	userfaultfd			sys_userfaultfd

374	common	membarrier			sys_membarrier

arch/microblaze/kernel/syscalls/syscall.tbl

+23 −23
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ 
121	common	setdomainname			sys_setdomainname

122	common	uname				sys_newuname

123	common	modify_ldt			sys_ni_syscall

124	common	adjtimex			sys_adjtimex

124	common	adjtimex			sys_adjtimex_time32

125	common	mprotect			sys_mprotect

126	common	sigprocmask			sys_sigprocmask

127	common	create_module			sys_ni_syscall
@@ -168,8 +168,8 @@ 
158	common	sched_yield			sys_sched_yield

159	common	sched_get_priority_max		sys_sched_get_priority_max

160	common	sched_get_priority_min		sys_sched_get_priority_min

161	common	sched_rr_get_interval		sys_sched_rr_get_interval

162	common	nanosleep			sys_nanosleep

161	common	sched_rr_get_interval		sys_sched_rr_get_interval_time32

162	common	nanosleep			sys_nanosleep_time32

163	common	mremap				sys_mremap

164	common	setresuid			sys_setresuid

165	common	getresuid			sys_getresuid
@@ -184,7 +184,7 @@ 
174	common	rt_sigaction			sys_rt_sigaction

175	common	rt_sigprocmask			sys_rt_sigprocmask

176	common	rt_sigpending			sys_rt_sigpending

177	common	rt_sigtimedwait			sys_rt_sigtimedwait

177	common	rt_sigtimedwait			sys_rt_sigtimedwait_time32

178	common	rt_sigqueueinfo			sys_rt_sigqueueinfo

179	common	rt_sigsuspend			sys_rt_sigsuspend

180	common	pread64				sys_pread64
@@ -247,14 +247,14 @@ 
237	common	fremovexattr			sys_fremovexattr

238	common	tkill				sys_tkill

239	common	sendfile64			sys_sendfile64

240	common	futex				sys_futex

240	common	futex				sys_futex_time32

241	common	sched_setaffinity		sys_sched_setaffinity

242	common	sched_getaffinity		sys_sched_getaffinity

243	common	set_thread_area			sys_ni_syscall

244	common	get_thread_area			sys_ni_syscall

245	common	io_setup			sys_io_setup

246	common	io_destroy			sys_io_destroy

247	common	io_getevents			sys_io_getevents

247	common	io_getevents			sys_io_getevents_time32

248	common	io_submit			sys_io_submit

249	common	io_cancel			sys_io_cancel

250	common	fadvise64			sys_fadvise64
@@ -267,14 +267,14 @@ 
257	common	remap_file_pages		sys_remap_file_pages

258	common	set_tid_address			sys_set_tid_address

259	common	timer_create			sys_timer_create

260	common	timer_settime			sys_timer_settime

261	common	timer_gettime			sys_timer_gettime

260	common	timer_settime			sys_timer_settime32

261	common	timer_gettime			sys_timer_gettime32

262	common	timer_getoverrun		sys_timer_getoverrun

263	common	timer_delete			sys_timer_delete

264	common	clock_settime			sys_clock_settime

265	common	clock_gettime			sys_clock_gettime

266	common	clock_getres			sys_clock_getres

267	common	clock_nanosleep			sys_clock_nanosleep

264	common	clock_settime			sys_clock_settime32

265	common	clock_gettime			sys_clock_gettime32

266	common	clock_getres			sys_clock_getres_time32

267	common	clock_nanosleep			sys_clock_nanosleep_time32

268	common	statfs64			sys_statfs64

269	common	fstatfs64			sys_fstatfs64

270	common	tgkill				sys_tgkill
@@ -286,8 +286,8 @@ 
276	common	set_mempolicy			sys_set_mempolicy

277	common	mq_open				sys_mq_open

278	common	mq_unlink			sys_mq_unlink

279	common	mq_timedsend			sys_mq_timedsend

280	common	mq_timedreceive			sys_mq_timedreceive

279	common	mq_timedsend			sys_mq_timedsend_time32

280	common	mq_timedreceive			sys_mq_timedreceive_time32

281	common	mq_notify			sys_mq_notify

282	common	mq_getsetattr			sys_mq_getsetattr

283	common	kexec_load			sys_kexec_load
@@ -315,8 +315,8 @@ 
305	common	readlinkat			sys_readlinkat

306	common	fchmodat			sys_fchmodat

307	common	faccessat			sys_faccessat

308	common	pselect6			sys_pselect6

309	common	ppoll				sys_ppoll

308	common	pselect6			sys_pselect6_time32

309	common	ppoll				sys_ppoll_time32

310	common	unshare				sys_unshare

311	common	set_robust_list			sys_set_robust_list

312	common	get_robust_list			sys_get_robust_list
@@ -327,14 +327,14 @@ 
317	common	move_pages			sys_move_pages

318	common	getcpu				sys_getcpu

319	common	epoll_pwait			sys_epoll_pwait

320	common	utimensat			sys_utimensat

320	common	utimensat			sys_utimensat_time32

321	common	signalfd			sys_signalfd

322	common	timerfd_create			sys_timerfd_create

323	common	eventfd				sys_eventfd

324	common	fallocate			sys_fallocate

325	common	semtimedop			sys_semtimedop

326	common	timerfd_settime			sys_timerfd_settime

327	common	timerfd_gettime			sys_timerfd_gettime

325	common	semtimedop			sys_semtimedop_time32

326	common	timerfd_settime			sys_timerfd_settime32

327	common	timerfd_gettime			sys_timerfd_gettime32

328	common	semctl				sys_old_semctl

329	common	semget				sys_semget

330	common	semop				sys_semop
@@ -374,13 +374,13 @@ 
364	common	pwritev				sys_pwritev

365	common	rt_tgsigqueueinfo		sys_rt_tgsigqueueinfo

366	common	perf_event_open			sys_perf_event_open

367	common	recvmmsg			sys_recvmmsg

367	common	recvmmsg			sys_recvmmsg_time32

368	common	fanotify_init			sys_fanotify_init

369	common	fanotify_mark			sys_fanotify_mark

370	common	prlimit64			sys_prlimit64

371	common	name_to_handle_at		sys_name_to_handle_at

372	common	open_by_handle_at		sys_open_by_handle_at

373	common	clock_adjtime			sys_clock_adjtime

373	common	clock_adjtime			sys_clock_adjtime32

374	common	syncfs				sys_syncfs

375	common	setns				sys_setns

376	common	sendmmsg			sys_sendmmsg
@@ -406,5 +406,5 @@ 
396	common	pkey_alloc			sys_pkey_alloc

397	common	pkey_free			sys_pkey_free

398	common	statx				sys_statx

399	common	io_pgetevents			sys_io_pgetevents

399	common	io_pgetevents			sys_io_pgetevents_time32

400	common	rseq				sys_rseq