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

Commit d33c577c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

y2038: rename old time and utime syscalls 



The time, stime, utime, utimes, and futimesat system calls are only
used on older architectures, and we do not provide y2038 safe variants
of them, as they are replaced by clock_gettime64, clock_settime64,
and utimensat_time64.

However, for consistency it seems better to have the 32-bit architectures
that still use them call the "time32" entry points (leaving the
traditional handlers for the 64-bit architectures), like we do for system
calls that now require two versions.

Note: We used to always define __ARCH_WANT_SYS_TIME and
__ARCH_WANT_SYS_UTIME and only set __ARCH_WANT_COMPAT_SYS_TIME and
__ARCH_WANT_SYS_UTIME32 for compat mode on 64-bit kernels. Now this is
reversed: only 64-bit architectures set __ARCH_WANT_SYS_TIME/UTIME, while
we need __ARCH_WANT_SYS_TIME32/UTIME32 for 32-bit architectures and compat
mode. The resulting asm/unistd.h changes look a bit counterintuitive.

This is only a cleanup patch and it should not change any behavior.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent c70a772f

arch/arm/include/asm/unistd.h

+2 −2
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 
#define __ARCH_WANT_SYS_SIGPROCMASK

#define __ARCH_WANT_SYS_OLD_MMAP

#define __ARCH_WANT_SYS_OLD_SELECT

#define __ARCH_WANT_SYS_UTIME

#define __ARCH_WANT_SYS_UTIME32



#if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT)

#define __ARCH_WANT_SYS_TIME

#define __ARCH_WANT_SYS_TIME32

#define __ARCH_WANT_SYS_IPC

#define __ARCH_WANT_SYS_OLDUMOUNT

#define __ARCH_WANT_SYS_ALARM

arch/arm/tools/syscall.tbl

+5 −5
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
10	common	unlink			sys_unlink

11	common	execve			sys_execve

12	common	chdir			sys_chdir

13	oabi	time			sys_time

13	oabi	time			sys_time32

14	common	mknod			sys_mknod

15	common	chmod			sys_chmod

16	common	lchown			sys_lchown16
@@ -36,12 +36,12 @@ 
22	oabi	umount			sys_oldumount

23	common	setuid			sys_setuid16

24	common	getuid			sys_getuid16

25	oabi	stime			sys_stime

25	oabi	stime			sys_stime32

26	common	ptrace			sys_ptrace

27	oabi	alarm			sys_alarm

# 28 was sys_fstat

29	common	pause			sys_pause

30	oabi	utime			sys_utime

30	oabi	utime			sys_utime32

# 31 was sys_stty

# 32 was sys_gtty

33	common	access			sys_access
@@ -283,7 +283,7 @@ 
266	common	statfs64		sys_statfs64_wrapper

267	common	fstatfs64		sys_fstatfs64_wrapper

268	common	tgkill			sys_tgkill

269	common	utimes			sys_utimes

269	common	utimes			sys_utimes_time32

270	common	arm_fadvise64_64	sys_arm_fadvise64_64

271	common	pciconfig_iobase	sys_pciconfig_iobase

272	common	pciconfig_read		sys_pciconfig_read
@@ -340,7 +340,7 @@ 
323	common	mkdirat			sys_mkdirat

324	common	mknodat			sys_mknodat

325	common	fchownat		sys_fchownat

326	common	futimesat		sys_futimesat

326	common	futimesat		sys_futimesat_time32

327	common	fstatat64		sys_fstatat64		sys_oabi_fstatat64

328	common	unlinkat		sys_unlinkat

329	common	renameat		sys_renameat

arch/m68k/include/asm/unistd.h

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
#define __ARCH_WANT_SYS_IPC

#define __ARCH_WANT_SYS_PAUSE

#define __ARCH_WANT_SYS_SIGNAL

#define __ARCH_WANT_SYS_TIME

#define __ARCH_WANT_SYS_UTIME

#define __ARCH_WANT_SYS_TIME32

#define __ARCH_WANT_SYS_UTIME32

#define __ARCH_WANT_SYS_WAITPID

#define __ARCH_WANT_SYS_SOCKETCALL

#define __ARCH_WANT_SYS_FADVISE64

arch/m68k/kernel/syscalls/syscall.tbl

+5 −5
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
10	common	unlink				sys_unlink

11	common	execve				sys_execve

12	common	chdir				sys_chdir

13	common	time				sys_time

13	common	time				sys_time32

14	common	mknod				sys_mknod

15	common	chmod				sys_chmod

16	common	chown				sys_chown16
@@ -32,12 +32,12 @@ 
22	common	umount				sys_oldumount

23	common	setuid				sys_setuid16

24	common	getuid				sys_getuid16

25	common	stime				sys_stime

25	common	stime				sys_stime32

26	common	ptrace				sys_ptrace

27	common	alarm				sys_alarm

28	common	oldfstat			sys_fstat

29	common	pause				sys_pause

30	common	utime				sys_utime

30	common	utime				sys_utime32

# 31 was stty

# 32 was gtty

33	common	access				sys_access
@@ -273,7 +273,7 @@ 
263	common	statfs64			sys_statfs64

264	common	fstatfs64			sys_fstatfs64

265	common	tgkill				sys_tgkill

266	common	utimes				sys_utimes

266	common	utimes				sys_utimes_time32

267	common	fadvise64_64			sys_fadvise64_64

268	common	mbind				sys_mbind

269	common	get_mempolicy			sys_get_mempolicy
@@ -299,7 +299,7 @@ 
289	common	mkdirat				sys_mkdirat

290	common	mknodat				sys_mknodat

291	common	fchownat			sys_fchownat

292	common	futimesat			sys_futimesat

292	common	futimesat			sys_futimesat_time32

293	common	fstatat64			sys_fstatat64

294	common	unlinkat			sys_unlinkat

295	common	renameat			sys_renameat

arch/microblaze/include/asm/unistd.h

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
#define __ARCH_WANT_SYS_GETHOSTNAME

#define __ARCH_WANT_SYS_PAUSE

#define __ARCH_WANT_SYS_SIGNAL

#define __ARCH_WANT_SYS_TIME

#define __ARCH_WANT_SYS_UTIME

#define __ARCH_WANT_SYS_TIME32

#define __ARCH_WANT_SYS_UTIME32

#define __ARCH_WANT_SYS_WAITPID

#define __ARCH_WANT_SYS_SOCKETCALL

#define __ARCH_WANT_SYS_FADVISE64