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.

Arnd Bergmann committed 7 years ago

Commit d33c5771 parent c70a77222 files · +98 −77Browse files

Unified · Split

22 files

arch/arm/include/asm/unistd.h +2 −2
arch/arm/tools/syscall.tbl +5 −5
arch/m68k/include/asm/unistd.h +2 −2
arch/m68k/kernel/syscalls/syscall.tbl +5 −5
arch/microblaze/include/asm/unistd.h +2 −2
arch/microblaze/kernel/syscalls/syscall.tbl +5 −5
arch/mips/include/asm/unistd.h +2 −2
arch/mips/kernel/syscalls/syscall_o32.tbl +5 −5
arch/parisc/include/asm/unistd.h +6 −3
arch/parisc/kernel/syscalls/syscall.tbl +10 −5
arch/powerpc/include/asm/unistd.h +4 −4
arch/powerpc/kernel/syscalls/syscall.tbl +14 −5
arch/s390/include/asm/unistd.h +1 −1
arch/sh/include/asm/unistd.h +2 −2
arch/sh/kernel/syscalls/syscall.tbl +5 −5
arch/sparc/include/asm/unistd.h +4 −4
arch/sparc/kernel/syscalls/syscall.tbl +9 −5
arch/x86/entry/syscalls/syscall_32.tbl +5 −5
arch/x86/include/asm/unistd.h +4 −4
arch/xtensa/include/asm/unistd.h +1 −1
arch/xtensa/kernel/syscalls/syscall.tbl +3 −3
kernel/time/time.c +2 −2

arch/arm/include/asm/unistd.h+2−2

@@ -26,10 +26,10 @@ · 25 unmodified lines
26	#define __ARCH_WANT_SYS_SIGPROCMASK	26	#define __ARCH_WANT_SYS_SIGPROCMASK
27	#define __ARCH_WANT_SYS_OLD_MMAP	27	#define __ARCH_WANT_SYS_OLD_MMAP
28	#define __ARCH_WANT_SYS_OLD_SELECT	28	#define __ARCH_WANT_SYS_OLD_SELECT
29	#define __ARCH_WANT_SYS_UTIME	29	#define __ARCH_WANT_SYS_UTIME32
30		30
31	#if !defined(CONFIG_AEABI) \|\| defined(CONFIG_OABI_COMPAT)	31	#if !defined(CONFIG_AEABI) \|\| defined(CONFIG_OABI_COMPAT)
32	#define __ARCH_WANT_SYS_TIME	32	#define __ARCH_WANT_SYS_TIME32
33	#define __ARCH_WANT_SYS_IPC	33	#define __ARCH_WANT_SYS_IPC
34	#define __ARCH_WANT_SYS_OLDUMOUNT	34	#define __ARCH_WANT_SYS_OLDUMOUNT
35	#define __ARCH_WANT_SYS_ALARM	35	#define __ARCH_WANT_SYS_ALARM

arch/arm/tools/syscall.tbl+5−5

@@ -24,7 +24,7 @@ · 23 unmodified lines
24	10 common unlink sys_unlink	24	10 common unlink sys_unlink
25	11 common execve sys_execve	25	11 common execve sys_execve
26	12 common chdir sys_chdir	26	12 common chdir sys_chdir
27	13 oabi time sys_time	27	13 oabi time sys_time32
28	14 common mknod sys_mknod	28	14 common mknod sys_mknod
29	15 common chmod sys_chmod	29	15 common chmod sys_chmod
30	16 common lchown sys_lchown16	30	16 common lchown sys_lchown16
@@ -36,12 +36,12 @@ · 5 unmodified lines
36	22 oabi umount sys_oldumount	36	22 oabi umount sys_oldumount
37	23 common setuid sys_setuid16	37	23 common setuid sys_setuid16
38	24 common getuid sys_getuid16	38	24 common getuid sys_getuid16
39	25 oabi stime sys_stime	39	25 oabi stime sys_stime32
40	26 common ptrace sys_ptrace	40	26 common ptrace sys_ptrace
41	27 oabi alarm sys_alarm	41	27 oabi alarm sys_alarm
42	# 28 was sys_fstat	42	# 28 was sys_fstat
43	29 common pause sys_pause	43	29 common pause sys_pause
44	30 oabi utime sys_utime	44	30 oabi utime sys_utime32
45	# 31 was sys_stty	45	# 31 was sys_stty
46	# 32 was sys_gtty	46	# 32 was sys_gtty
47	33 common access sys_access	47	33 common access sys_access
@@ -283,7 +283,7 @@ · 235 unmodified lines
283	266 common statfs64 sys_statfs64_wrapper	283	266 common statfs64 sys_statfs64_wrapper
284	267 common fstatfs64 sys_fstatfs64_wrapper	284	267 common fstatfs64 sys_fstatfs64_wrapper
285	268 common tgkill sys_tgkill	285	268 common tgkill sys_tgkill
286	269 common utimes sys_utimes	286	269 common utimes sys_utimes_time32
287	270 common arm_fadvise64_64 sys_arm_fadvise64_64	287	270 common arm_fadvise64_64 sys_arm_fadvise64_64
288	271 common pciconfig_iobase sys_pciconfig_iobase	288	271 common pciconfig_iobase sys_pciconfig_iobase
289	272 common pciconfig_read sys_pciconfig_read	289	272 common pciconfig_read sys_pciconfig_read
@@ -340,7 +340,7 @@ · 50 unmodified lines
340	323 common mkdirat sys_mkdirat	340	323 common mkdirat sys_mkdirat
341	324 common mknodat sys_mknodat	341	324 common mknodat sys_mknodat
342	325 common fchownat sys_fchownat	342	325 common fchownat sys_fchownat
343	326 common futimesat sys_futimesat	343	326 common futimesat sys_futimesat_time32
344	327 common fstatat64 sys_fstatat64 sys_oabi_fstatat64	344	327 common fstatat64 sys_fstatat64 sys_oabi_fstatat64
345	328 common unlinkat sys_unlinkat	345	328 common unlinkat sys_unlinkat
346	329 common renameat sys_renameat	346	329 common renameat sys_renameat

arch/m68k/include/asm/unistd.h+2−2

@@ -15,8 +15,8 @@ · 14 unmodified lines
15	#define __ARCH_WANT_SYS_IPC	15	#define __ARCH_WANT_SYS_IPC
16	#define __ARCH_WANT_SYS_PAUSE	16	#define __ARCH_WANT_SYS_PAUSE
17	#define __ARCH_WANT_SYS_SIGNAL	17	#define __ARCH_WANT_SYS_SIGNAL
18	#define __ARCH_WANT_SYS_TIME	18	#define __ARCH_WANT_SYS_TIME32
19	#define __ARCH_WANT_SYS_UTIME	19	#define __ARCH_WANT_SYS_UTIME32
20	#define __ARCH_WANT_SYS_WAITPID	20	#define __ARCH_WANT_SYS_WAITPID
21	#define __ARCH_WANT_SYS_SOCKETCALL	21	#define __ARCH_WANT_SYS_SOCKETCALL
22	#define __ARCH_WANT_SYS_FADVISE64	22	#define __ARCH_WANT_SYS_FADVISE64

arch/m68k/kernel/syscalls/syscall.tbl+5−5

@@ -20,7 +20,7 @@ · 19 unmodified lines
20	10 common unlink sys_unlink	20	10 common unlink sys_unlink
21	11 common execve sys_execve	21	11 common execve sys_execve
22	12 common chdir sys_chdir	22	12 common chdir sys_chdir
23	13 common time sys_time	23	13 common time sys_time32
24	14 common mknod sys_mknod	24	14 common mknod sys_mknod
25	15 common chmod sys_chmod	25	15 common chmod sys_chmod
26	16 common chown sys_chown16	26	16 common chown sys_chown16
@@ -32,12 +32,12 @@ · 5 unmodified lines
32	22 common umount sys_oldumount	32	22 common umount sys_oldumount
33	23 common setuid sys_setuid16	33	23 common setuid sys_setuid16
34	24 common getuid sys_getuid16	34	24 common getuid sys_getuid16
35	25 common stime sys_stime	35	25 common stime sys_stime32
36	26 common ptrace sys_ptrace	36	26 common ptrace sys_ptrace
37	27 common alarm sys_alarm	37	27 common alarm sys_alarm
38	28 common oldfstat sys_fstat	38	28 common oldfstat sys_fstat
39	29 common pause sys_pause	39	29 common pause sys_pause
40	30 common utime sys_utime	40	30 common utime sys_utime32
41	# 31 was stty	41	# 31 was stty
42	# 32 was gtty	42	# 32 was gtty
43	33 common access sys_access	43	33 common access sys_access
@@ -273,7 +273,7 @@ · 229 unmodified lines
273	263 common statfs64 sys_statfs64	273	263 common statfs64 sys_statfs64
274	264 common fstatfs64 sys_fstatfs64	274	264 common fstatfs64 sys_fstatfs64
275	265 common tgkill sys_tgkill	275	265 common tgkill sys_tgkill
276	266 common utimes sys_utimes	276	266 common utimes sys_utimes_time32
277	267 common fadvise64_64 sys_fadvise64_64	277	267 common fadvise64_64 sys_fadvise64_64
278	268 common mbind sys_mbind	278	268 common mbind sys_mbind
279	269 common get_mempolicy sys_get_mempolicy	279	269 common get_mempolicy sys_get_mempolicy
@@ -299,7 +299,7 @@ · 19 unmodified lines
299	289 common mkdirat sys_mkdirat	299	289 common mkdirat sys_mkdirat
300	290 common mknodat sys_mknodat	300	290 common mknodat sys_mknodat
301	291 common fchownat sys_fchownat	301	291 common fchownat sys_fchownat
302	292 common futimesat sys_futimesat	302	292 common futimesat sys_futimesat_time32
303	293 common fstatat64 sys_fstatat64	303	293 common fstatat64 sys_fstatat64
304	294 common unlinkat sys_unlinkat	304	294 common unlinkat sys_unlinkat
305	295 common renameat sys_renameat	305	295 common renameat sys_renameat

arch/microblaze/include/asm/unistd.h+2−2

@@ -21,8 +21,8 @@ · 20 unmodified lines
21	#define __ARCH_WANT_SYS_GETHOSTNAME	21	#define __ARCH_WANT_SYS_GETHOSTNAME
22	#define __ARCH_WANT_SYS_PAUSE	22	#define __ARCH_WANT_SYS_PAUSE
23	#define __ARCH_WANT_SYS_SIGNAL	23	#define __ARCH_WANT_SYS_SIGNAL
24	#define __ARCH_WANT_SYS_TIME	24	#define __ARCH_WANT_SYS_TIME32
25	#define __ARCH_WANT_SYS_UTIME	25	#define __ARCH_WANT_SYS_UTIME32
26	#define __ARCH_WANT_SYS_WAITPID	26	#define __ARCH_WANT_SYS_WAITPID
27	#define __ARCH_WANT_SYS_SOCKETCALL	27	#define __ARCH_WANT_SYS_SOCKETCALL
28	#define __ARCH_WANT_SYS_FADVISE64	28	#define __ARCH_WANT_SYS_FADVISE64

arch/microblaze/kernel/syscalls/syscall.tbl+5−5

@@ -20,7 +20,7 @@ · 19 unmodified lines
20	10 common unlink sys_unlink	20	10 common unlink sys_unlink
21	11 common execve sys_execve	21	11 common execve sys_execve
22	12 common chdir sys_chdir	22	12 common chdir sys_chdir
23	13 common time sys_time	23	13 common time sys_time32
24	14 common mknod sys_mknod	24	14 common mknod sys_mknod
25	15 common chmod sys_chmod	25	15 common chmod sys_chmod
26	16 common lchown sys_lchown	26	16 common lchown sys_lchown
@@ -32,12 +32,12 @@ · 5 unmodified lines
32	22 common umount sys_oldumount	32	22 common umount sys_oldumount
33	23 common setuid sys_setuid	33	23 common setuid sys_setuid
34	24 common getuid sys_getuid	34	24 common getuid sys_getuid
35	25 common stime sys_stime	35	25 common stime sys_stime32
36	26 common ptrace sys_ptrace	36	26 common ptrace sys_ptrace
37	27 common alarm sys_alarm	37	27 common alarm sys_alarm
38	28 common oldfstat sys_ni_syscall	38	28 common oldfstat sys_ni_syscall
39	29 common pause sys_pause	39	29 common pause sys_pause
40	30 common utime sys_utime	40	30 common utime sys_utime32
41	31 common stty sys_ni_syscall	41	31 common stty sys_ni_syscall
42	32 common gtty sys_ni_syscall	42	32 common gtty sys_ni_syscall
43	33 common access sys_access	43	33 common access sys_access
@@ -278,7 +278,7 @@ · 234 unmodified lines
278	268 common statfs64 sys_statfs64	278	268 common statfs64 sys_statfs64
279	269 common fstatfs64 sys_fstatfs64	279	269 common fstatfs64 sys_fstatfs64
280	270 common tgkill sys_tgkill	280	270 common tgkill sys_tgkill
281	271 common utimes sys_utimes	281	271 common utimes sys_utimes_time32
282	272 common fadvise64_64 sys_fadvise64_64	282	272 common fadvise64_64 sys_fadvise64_64
283	273 common vserver sys_ni_syscall	283	273 common vserver sys_ni_syscall
284	274 common mbind sys_mbind	284	274 common mbind sys_mbind
@@ -306,7 +306,7 @@ · 21 unmodified lines
306	296 common mkdirat sys_mkdirat	306	296 common mkdirat sys_mkdirat
307	297 common mknodat sys_mknodat	307	297 common mknodat sys_mknodat
308	298 common fchownat sys_fchownat	308	298 common fchownat sys_fchownat
309	299 common futimesat sys_futimesat	309	299 common futimesat sys_futimesat_time32
310	300 common fstatat64 sys_fstatat64	310	300 common fstatat64 sys_fstatat64
311	301 common unlinkat sys_unlinkat	311	301 common unlinkat sys_unlinkat
312	302 common renameat sys_renameat	312	302 common renameat sys_renameat

arch/mips/include/asm/unistd.h+2−2

@@ -45,10 +45,10 @@ · 44 unmodified lines
45	#define __ARCH_WANT_SYS_SIGPROCMASK	45	#define __ARCH_WANT_SYS_SIGPROCMASK
46	# ifdef CONFIG_32BIT	46	# ifdef CONFIG_32BIT
47	# define __ARCH_WANT_STAT64	47	# define __ARCH_WANT_STAT64
48	# define __ARCH_WANT_SYS_TIME	48	# define __ARCH_WANT_SYS_TIME32
49	# endif	49	# endif
50	# ifdef CONFIG_MIPS32_O32	50	# ifdef CONFIG_MIPS32_O32
51	# define __ARCH_WANT_COMPAT_SYS_TIME	51	# define __ARCH_WANT_SYS_TIME32
52	# endif	52	# endif
53	#define __ARCH_WANT_SYS_FORK	53	#define __ARCH_WANT_SYS_FORK
54	#define __ARCH_WANT_SYS_CLONE	54	#define __ARCH_WANT_SYS_CLONE

arch/mips/kernel/syscalls/syscall_o32.tbl+5−5

@@ -20,7 +20,7 @@ · 19 unmodified lines
20	10 o32 unlink sys_unlink	20	10 o32 unlink sys_unlink
21	11 o32 execve sys_execve compat_sys_execve	21	11 o32 execve sys_execve compat_sys_execve
22	12 o32 chdir sys_chdir	22	12 o32 chdir sys_chdir
23	13 o32 time sys_time sys_time32	23	13 o32 time sys_time32
24	14 o32 mknod sys_mknod	24	14 o32 mknod sys_mknod
25	15 o32 chmod sys_chmod	25	15 o32 chmod sys_chmod
26	16 o32 lchown sys_lchown	26	16 o32 lchown sys_lchown
@@ -33,13 +33,13 @@ · 6 unmodified lines
33	22 o32 umount sys_oldumount	33	22 o32 umount sys_oldumount
34	23 o32 setuid sys_setuid	34	23 o32 setuid sys_setuid
35	24 o32 getuid sys_getuid	35	24 o32 getuid sys_getuid
36	25 o32 stime sys_stime sys_stime32	36	25 o32 stime sys_stime32
37	26 o32 ptrace sys_ptrace compat_sys_ptrace	37	26 o32 ptrace sys_ptrace compat_sys_ptrace
38	27 o32 alarm sys_alarm	38	27 o32 alarm sys_alarm
39	# 28 was sys_fstat	39	# 28 was sys_fstat
40	28 o32 unused28 sys_ni_syscall	40	28 o32 unused28 sys_ni_syscall
41	29 o32 pause sys_pause	41	29 o32 pause sys_pause
42	30 o32 utime sys_utime sys_utime32	42	30 o32 utime sys_utime32
43	31 o32 stty sys_ni_syscall	43	31 o32 stty sys_ni_syscall
44	32 o32 gtty sys_ni_syscall	44	32 o32 gtty sys_ni_syscall
45	33 o32 access sys_access	45	33 o32 access sys_access
@@ -278,7 +278,7 @@ · 232 unmodified lines
278	264 o32 clock_getres sys_clock_getres_time32	278	264 o32 clock_getres sys_clock_getres_time32
279	265 o32 clock_nanosleep sys_clock_nanosleep_time32	279	265 o32 clock_nanosleep sys_clock_nanosleep_time32
280	266 o32 tgkill sys_tgkill	280	266 o32 tgkill sys_tgkill
281	267 o32 utimes sys_utimes sys_utimes_time32	281	267 o32 utimes sys_utimes_time32
282	268 o32 mbind sys_mbind compat_sys_mbind	282	268 o32 mbind sys_mbind compat_sys_mbind
283	269 o32 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy	283	269 o32 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
284	270 o32 set_mempolicy sys_set_mempolicy compat_sys_set_mempolicy	284	270 o32 set_mempolicy sys_set_mempolicy compat_sys_set_mempolicy
@@ -303,7 +303,7 @@ · 18 unmodified lines
303	289 o32 mkdirat sys_mkdirat	303	289 o32 mkdirat sys_mkdirat
304	290 o32 mknodat sys_mknodat	304	290 o32 mknodat sys_mknodat
305	291 o32 fchownat sys_fchownat	305	291 o32 fchownat sys_fchownat
306	292 o32 futimesat sys_futimesat sys_futimesat_time32	306	292 o32 futimesat sys_futimesat_time32
307	293 o32 fstatat64 sys_fstatat64 sys_newfstatat	307	293 o32 fstatat64 sys_fstatat64 sys_newfstatat
308	294 o32 unlinkat sys_unlinkat	308	294 o32 unlinkat sys_unlinkat
309	295 o32 renameat sys_renameat	309	295 o32 renameat sys_renameat

arch/parisc/include/asm/unistd.h+6−3

 #define __ARCH_WANT_SYS_GETHOSTNAME
 #define __ARCH_WANT_SYS_PAUSE
 #define __ARCH_WANT_SYS_SIGNAL
-#define __ARCH_WANT_SYS_TIME
+#define __ARCH_WANT_SYS_TIME32
-#define __ARCH_WANT_COMPAT_SYS_TIME
 #define __ARCH_WANT_COMPAT_SYS_SCHED_RR_GET_INTERVAL
-#define __ARCH_WANT_SYS_UTIME
 #define __ARCH_WANT_SYS_UTIME32
 #define __ARCH_WANT_SYS_WAITPID
 #define __ARCH_WANT_SYS_SOCKETCALL
 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_COMPAT_SYS_SENDFILE
+#ifdef CONFIG_64BIT
+#define __ARCH_WANT_SYS_TIME
+#define __ARCH_WANT_SYS_UTIME
+#endif
 #endif /* __ASSEMBLY__ */
 #undef STR

arch/parisc/kernel/syscalls/syscall.tbl+10−5

 10	common	unlink			sys_unlink
 11	common	execve			sys_execve			compat_sys_execve
 12	common	chdir			sys_chdir
-13	common	time			sys_time			sys_time32
+13	32	time			sys_time32
+13	64	time			sys_time
 14	common	mknod			sys_mknod
 15	common	chmod			sys_chmod
 16	common	lchown			sys_lchown
 22	common	bind			sys_bind
 23	common	setuid			sys_setuid
 24	common	getuid			sys_getuid
-25	common	stime			sys_stime			sys_stime32
+25	32	stime			sys_stime32
+25	64	stime			sys_stime
 26	common	ptrace			sys_ptrace			compat_sys_ptrace
 27	common	alarm			sys_alarm
 28	common	fstat			sys_newfstat			compat_sys_newfstat
 29	common	pause			sys_pause
-30	common	utime			sys_utime			sys_utime32
+30	32	utime			sys_utime32
+30	64	utime			sys_utime
 31	common	connect			sys_connect
 32	common	listen			sys_listen
 33	common	access			sys_access
 276	common	mkdirat			sys_mkdirat
 277	common	mknodat			sys_mknodat
 278	common	fchownat		sys_fchownat
-279	common	futimesat		sys_futimesat			sys_futimesat_time32
+279	32	futimesat		sys_futimesat_time32
+279	64	futimesat		sys_futimesat
 280	common	fstatat64		sys_fstatat64
 281	common	unlinkat		sys_unlinkat
 282	common	renameat		sys_renameat
 333	common	finit_module		sys_finit_module
 334	common	sched_setattr		sys_sched_setattr
 335	common	sched_getattr		sys_sched_getattr
-336	common	utimes			sys_utimes			sys_utimes_time32
+336	32	utimes			sys_utimes_time32
+336	64	utimes			sys_utimes
 337	common	renameat2		sys_renameat2
 338	common	seccomp			sys_seccomp
 339	common	getrandom		sys_getrandom

arch/powerpc/include/asm/unistd.h+4−4

@@ -29,8 +29,8 @@ · 28 unmodified lines
29	#define __ARCH_WANT_SYS_IPC	29	#define __ARCH_WANT_SYS_IPC
30	#define __ARCH_WANT_SYS_PAUSE	30	#define __ARCH_WANT_SYS_PAUSE
31	#define __ARCH_WANT_SYS_SIGNAL	31	#define __ARCH_WANT_SYS_SIGNAL
32	#define __ARCH_WANT_SYS_TIME	32	#define __ARCH_WANT_SYS_TIME32
33	#define __ARCH_WANT_SYS_UTIME	33	#define __ARCH_WANT_SYS_UTIME32
34	#define __ARCH_WANT_SYS_WAITPID	34	#define __ARCH_WANT_SYS_WAITPID
35	#define __ARCH_WANT_SYS_SOCKETCALL	35	#define __ARCH_WANT_SYS_SOCKETCALL
36	#define __ARCH_WANT_SYS_FADVISE64	36	#define __ARCH_WANT_SYS_FADVISE64
@@ -45,8 +45,8 @@ · 8 unmodified lines
45	#define __ARCH_WANT_OLD_STAT	45	#define __ARCH_WANT_OLD_STAT
46	#endif	46	#endif
47	#ifdef CONFIG_PPC64	47	#ifdef CONFIG_PPC64
48	#define __ARCH_WANT_COMPAT_SYS_TIME	48	#define __ARCH_WANT_SYS_TIME
49	#define __ARCH_WANT_SYS_UTIME32	49	#define __ARCH_WANT_SYS_UTIME
50	#define __ARCH_WANT_SYS_NEWFSTATAT	50	#define __ARCH_WANT_SYS_NEWFSTATAT
51	#define __ARCH_WANT_COMPAT_SYS_SENDFILE	51	#define __ARCH_WANT_COMPAT_SYS_SENDFILE
52	#endif	52	#endif

arch/powerpc/kernel/syscalls/syscall.tbl+14−5

 10	common	unlink				sys_unlink
 11	nospu	execve				sys_execve			compat_sys_execve
 12	common	chdir				sys_chdir
-13	common	time				sys_time			sys_time32
+13	32	time				sys_time32
+13	64	time				sys_time
+13	spu	time				sys_time
 14	common	mknod				sys_mknod
 15	common	chmod				sys_chmod
 16	common	lchown				sys_lchown
 22	spu	umount				sys_ni_syscall
 23	common	setuid				sys_setuid
 24	common	getuid				sys_getuid
-25	common	stime				sys_stime			sys_stime32
+25	32	stime				sys_stime32
+25	64	stime				sys_stime
+25	spu	stime				sys_stime
 26	nospu	ptrace				sys_ptrace			compat_sys_ptrace
 27	common	alarm				sys_alarm
 28	32	oldfstat			sys_fstat			sys_ni_syscall
 28	64	oldfstat			sys_ni_syscall
 28	spu	oldfstat			sys_ni_syscall
 29	nospu	pause				sys_pause
-30	nospu	utime				sys_utime			sys_utime32
+30	32	utime				sys_utime32
+30	64	utime				sys_utime
 31	common	stty				sys_ni_syscall
 32	common	gtty				sys_ni_syscall
 33	common	access				sys_access
 249	64	swapcontext			ppc64_swapcontext
 249	spu	swapcontext			sys_ni_syscall
 250	common	tgkill				sys_tgkill
-251	common	utimes				sys_utimes			sys_utimes_time32
+251	32	utimes				sys_utimes_time32
+251	64	utimes				sys_utimes
+251	spu	utimes				sys_utimes
 252	common	statfs64			sys_statfs64			compat_sys_statfs64
 253	common	fstatfs64			sys_fstatfs64			compat_sys_fstatfs64
 254	32	fadvise64_64			ppc_fadvise64_64
 287	common	mkdirat				sys_mkdirat
 288	common	mknodat				sys_mknodat
 289	common	fchownat			sys_fchownat
-290	common	futimesat			sys_futimesat			sys_futimesat_time32
+290	32	futimesat			sys_futimesat_time32
+290	64	futimesat			sys_futimesat
+290	spu	utimesat			sys_futimesat
 291	32	fstatat64			sys_fstatat64
 291	64	newfstatat			sys_newfstatat
 291	spu	newfstatat			sys_newfstatat

arch/s390/include/asm/unistd.h+1−1

@@ -28,7 +28,7 @@ · 27 unmodified lines
28	#define __ARCH_WANT_SYS_SIGPENDING	28	#define __ARCH_WANT_SYS_SIGPENDING
29	#define __ARCH_WANT_SYS_SIGPROCMASK	29	#define __ARCH_WANT_SYS_SIGPROCMASK
30	# ifdef CONFIG_COMPAT	30	# ifdef CONFIG_COMPAT
31	# define __ARCH_WANT_COMPAT_SYS_TIME	31	# define __ARCH_WANT_SYS_TIME32
32	# define __ARCH_WANT_SYS_UTIME32	32	# define __ARCH_WANT_SYS_UTIME32
33	# endif	33	# endif
34	#define __ARCH_WANT_SYS_FORK	34	#define __ARCH_WANT_SYS_FORK

arch/sh/include/asm/unistd.h+2−2

@@ -16,8 +16,8 @@ · 15 unmodified lines
16	# define __ARCH_WANT_SYS_IPC	16	# define __ARCH_WANT_SYS_IPC
17	# define __ARCH_WANT_SYS_PAUSE	17	# define __ARCH_WANT_SYS_PAUSE
18	# define __ARCH_WANT_SYS_SIGNAL	18	# define __ARCH_WANT_SYS_SIGNAL
19	# define __ARCH_WANT_SYS_TIME	19	# define __ARCH_WANT_SYS_TIME32
20	# define __ARCH_WANT_SYS_UTIME	20	# define __ARCH_WANT_SYS_UTIME32
21	# define __ARCH_WANT_SYS_WAITPID	21	# define __ARCH_WANT_SYS_WAITPID
22	# define __ARCH_WANT_SYS_SOCKETCALL	22	# define __ARCH_WANT_SYS_SOCKETCALL
23	# define __ARCH_WANT_SYS_FADVISE64	23	# define __ARCH_WANT_SYS_FADVISE64

arch/sh/kernel/syscalls/syscall.tbl+5−5

@@ -20,7 +20,7 @@ · 19 unmodified lines
20	10 common unlink sys_unlink	20	10 common unlink sys_unlink
21	11 common execve sys_execve	21	11 common execve sys_execve
22	12 common chdir sys_chdir	22	12 common chdir sys_chdir
23	13 common time sys_time	23	13 common time sys_time32
24	14 common mknod sys_mknod	24	14 common mknod sys_mknod
25	15 common chmod sys_chmod	25	15 common chmod sys_chmod
26	16 common lchown sys_lchown16	26	16 common lchown sys_lchown16
@@ -32,12 +32,12 @@ · 5 unmodified lines
32	22 common umount sys_oldumount	32	22 common umount sys_oldumount
33	23 common setuid sys_setuid16	33	23 common setuid sys_setuid16
34	24 common getuid sys_getuid16	34	24 common getuid sys_getuid16
35	25 common stime sys_stime	35	25 common stime sys_stime32
36	26 common ptrace sys_ptrace	36	26 common ptrace sys_ptrace
37	27 common alarm sys_alarm	37	27 common alarm sys_alarm
38	28 common oldfstat sys_fstat	38	28 common oldfstat sys_fstat
39	29 common pause sys_pause	39	29 common pause sys_pause
40	30 common utime sys_utime	40	30 common utime sys_utime32
41	# 31 was stty	41	# 31 was stty
42	# 32 was gtty	42	# 32 was gtty
43	33 common access sys_access	43	33 common access sys_access
@@ -278,7 +278,7 @@ · 234 unmodified lines
278	268 common statfs64 sys_statfs64	278	268 common statfs64 sys_statfs64
279	269 common fstatfs64 sys_fstatfs64	279	269 common fstatfs64 sys_fstatfs64
280	270 common tgkill sys_tgkill	280	270 common tgkill sys_tgkill
281	271 common utimes sys_utimes	281	271 common utimes sys_utimes_time32
282	272 common fadvise64_64 sys_fadvise64_64_wrapper	282	272 common fadvise64_64 sys_fadvise64_64_wrapper
283	# 273 is reserved for vserver	283	# 273 is reserved for vserver
284	274 common mbind sys_mbind	284	274 common mbind sys_mbind
@@ -306,7 +306,7 @@ · 21 unmodified lines
306	296 common mkdirat sys_mkdirat	306	296 common mkdirat sys_mkdirat
307	297 common mknodat sys_mknodat	307	297 common mknodat sys_mknodat
308	298 common fchownat sys_fchownat	308	298 common fchownat sys_fchownat
309	299 common futimesat sys_futimesat	309	299 common futimesat sys_futimesat_time32
310	300 common fstatat64 sys_fstatat64	310	300 common fstatat64 sys_fstatat64
311	301 common unlinkat sys_unlinkat	311	301 common unlinkat sys_unlinkat
312	302 common renameat sys_renameat	312	302 common renameat sys_renameat

arch/sparc/include/asm/unistd.h+4−4

@@ -30,8 +30,8 @@ · 29 unmodified lines
30	#define __ARCH_WANT_SYS_GETHOSTNAME	30	#define __ARCH_WANT_SYS_GETHOSTNAME
31	#define __ARCH_WANT_SYS_PAUSE	31	#define __ARCH_WANT_SYS_PAUSE
32	#define __ARCH_WANT_SYS_SIGNAL	32	#define __ARCH_WANT_SYS_SIGNAL
33	#define __ARCH_WANT_SYS_TIME	33	#define __ARCH_WANT_SYS_TIME32
34	#define __ARCH_WANT_SYS_UTIME	34	#define __ARCH_WANT_SYS_UTIME32
35	#define __ARCH_WANT_SYS_WAITPID	35	#define __ARCH_WANT_SYS_WAITPID
36	#define __ARCH_WANT_SYS_SOCKETCALL	36	#define __ARCH_WANT_SYS_SOCKETCALL
37	#define __ARCH_WANT_SYS_FADVISE64	37	#define __ARCH_WANT_SYS_FADVISE64
@@ -43,8 +43,8 @@ · 5 unmodified lines
43	#ifdef __32bit_syscall_numbers__	43	#ifdef __32bit_syscall_numbers__
44	#define __ARCH_WANT_SYS_IPC	44	#define __ARCH_WANT_SYS_IPC
45	#else	45	#else
46	#define __ARCH_WANT_COMPAT_SYS_TIME	46	#define __ARCH_WANT_SYS_TIME
47	#define __ARCH_WANT_SYS_UTIME32	47	#define __ARCH_WANT_SYS_UTIME
48	#define __ARCH_WANT_COMPAT_SYS_SENDFILE	48	#define __ARCH_WANT_COMPAT_SYS_SENDFILE
49	#endif	49	#endif
50		50

arch/sparc/kernel/syscalls/syscall.tbl+9−5

 28	common	sigaltstack		sys_sigaltstack			compat_sys_sigaltstack
 29	32    	pause			sys_pause
 29	64    	pause			sys_nis_syscall
-30	common	utime			sys_utime			sys_utime32
+30	32	utime			sys_utime32
+30	64	utime			sys_utime
 31	32    	lchown32		sys_lchown
 32	32    	fchown32		sys_fchown
 33	common	access			sys_access
 135	common	socketpair		sys_socketpair
 136	common	mkdir			sys_mkdir
 137	common	rmdir			sys_rmdir
-138	common	utimes			sys_utimes			sys_utimes_time32
+138	32	utimes			sys_utimes_time32
+138	64	utimes			sys_utimes
 139	common	stat64			sys_stat64			compat_sys_stat64
 140	common	sendfile64		sys_sendfile64
 141	common	getpeername		sys_getpeername
 228	common	setfsuid		sys_setfsuid16
 229	common	setfsgid		sys_setfsgid16
 230	common	_newselect		sys_select			compat_sys_select
-231	32	time			sys_time			sys_time32
+231	32	time			sys_time32
 232	common	splice			sys_splice
-233	common	stime			sys_stime			sys_stime32
+233	32	stime			sys_stime32
+233	64	stime			sys_stime
 234	common	statfs64		sys_statfs64			compat_sys_statfs64
 235	common	fstatfs64		sys_fstatfs64			compat_sys_fstatfs64
 236	common	_llseek			sys_llseek
 285	common	mkdirat			sys_mkdirat
 286	common	mknodat			sys_mknodat
 287	common	fchownat		sys_fchownat
-288	common	futimesat		sys_futimesat			sys_futimesat_time32
+288	32	futimesat		sys_futimesat_time32
+288	64	futimesat		sys_futimesat
 289	common	fstatat64		sys_fstatat64			compat_sys_fstatat64
 290	common	unlinkat		sys_unlinkat
 291	common	renameat		sys_renameat

arch/x86/entry/syscalls/syscall_32.tbl+5−5

arch/x86/include/asm/unistd.h+4−4

arch/xtensa/include/asm/unistd.h+1−1

@@ -7,7 +7,7 @@ · 6 unmodified lines
7		7
8	#define __ARCH_WANT_NEW_STAT	8	#define __ARCH_WANT_NEW_STAT
9	#define __ARCH_WANT_STAT64	9	#define __ARCH_WANT_STAT64
10	#define __ARCH_WANT_SYS_UTIME	10	#define __ARCH_WANT_SYS_UTIME32
11	#define __ARCH_WANT_SYS_GETPGRP	11	#define __ARCH_WANT_SYS_GETPGRP
12		12
13	#define NR_syscalls __NR_syscalls	13	#define NR_syscalls __NR_syscalls

arch/xtensa/kernel/syscalls/syscall.tbl+3−3

@@ -72,8 +72,8 @@ · 71 unmodified lines
72	61 common fcntl64 sys_fcntl64	72	61 common fcntl64 sys_fcntl64
73	62 common fallocate sys_fallocate	73	62 common fallocate sys_fallocate
74	63 common fadvise64_64 xtensa_fadvise64_64	74	63 common fadvise64_64 xtensa_fadvise64_64
75	64 common utime sys_utime	75	64 common utime sys_utime32
76	65 common utimes sys_utimes	76	65 common utimes sys_utimes_time32
77	66 common ioctl sys_ioctl	77	66 common ioctl sys_ioctl
78	67 common fcntl sys_fcntl	78	67 common fcntl sys_fcntl
79	68 common setxattr sys_setxattr	79	68 common setxattr sys_setxattr
@@ -318,7 +318,7 @@ · 238 unmodified lines
318	295 common readlinkat sys_readlinkat	318	295 common readlinkat sys_readlinkat
319	296 common utimensat sys_utimensat_time32	319	296 common utimensat sys_utimensat_time32
320	297 common fchownat sys_fchownat	320	297 common fchownat sys_fchownat
321	298 common futimesat sys_futimesat	321	298 common futimesat sys_futimesat_time32
322	299 common fstatat64 sys_fstatat64	322	299 common fstatat64 sys_fstatat64
323	300 common fchmodat sys_fchmodat	323	300 common fchmodat sys_fchmodat
324	301 common faccessat sys_faccessat	324	301 common faccessat sys_faccessat

kernel/time/time.c+2−2

@@ -99,7 +99,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, tptr) · 98 unmodified lines
99	#endif /* __ARCH_WANT_SYS_TIME */	99	#endif /* __ARCH_WANT_SYS_TIME */
100		100
101	#ifdef CONFIG_COMPAT_32BIT_TIME	101	#ifdef CONFIG_COMPAT_32BIT_TIME
102	#ifdef __ARCH_WANT_COMPAT_SYS_TIME	102	#ifdef __ARCH_WANT_SYS_TIME32
103		103
104	/* old_time32_t is a 32 bit "long" and needs to get converted. */	104	/* old_time32_t is a 32 bit "long" and needs to get converted. */
105	SYSCALL_DEFINE1(time32, old_time32_t __user *, tloc)	105	SYSCALL_DEFINE1(time32, old_time32_t __user *, tloc)
@@ -134,7 +134,7 @@ SYSCALL_DEFINE1(stime32, old_time32_t __user *, tptr) · 28 unmodified lines
134	return 0;	134	return 0;
135	}	135	}
136		136
137	#endif /* __ARCH_WANT_COMPAT_SYS_TIME */	137	#endif /* __ARCH_WANT_SYS_TIME32 */
138	#endif	138	#endif
139		139
140	SYSCALL_DEFINE2(gettimeofday, struct timeval __user *, tv,	140	SYSCALL_DEFINE2(gettimeofday, struct timeval __user *, tv,

y2038: rename old time and utime syscalls

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -24,7 +24,7 @@ · 23 unmodified lines
24	10 i386 unlink sys_unlink __ia32_sys_unlink	24	10 i386 unlink sys_unlink __ia32_sys_unlink
25	11 i386 execve sys_execve __ia32_compat_sys_execve	25	11 i386 execve sys_execve __ia32_compat_sys_execve
26	12 i386 chdir sys_chdir __ia32_sys_chdir	26	12 i386 chdir sys_chdir __ia32_sys_chdir
27	13 i386 time sys_time __ia32_sys_time32	27	13 i386 time sys_time32 __ia32_sys_time32
28	14 i386 mknod sys_mknod __ia32_sys_mknod	28	14 i386 mknod sys_mknod __ia32_sys_mknod
29	15 i386 chmod sys_chmod __ia32_sys_chmod	29	15 i386 chmod sys_chmod __ia32_sys_chmod
30	16 i386 lchown sys_lchown16 __ia32_sys_lchown16	30	16 i386 lchown sys_lchown16 __ia32_sys_lchown16
@@ -36,12 +36,12 @@ · 5 unmodified lines
36	22 i386 umount sys_oldumount __ia32_sys_oldumount	36	22 i386 umount sys_oldumount __ia32_sys_oldumount
37	23 i386 setuid sys_setuid16 __ia32_sys_setuid16	37	23 i386 setuid sys_setuid16 __ia32_sys_setuid16
38	24 i386 getuid sys_getuid16 __ia32_sys_getuid16	38	24 i386 getuid sys_getuid16 __ia32_sys_getuid16
39	25 i386 stime sys_stime __ia32_sys_stime32	39	25 i386 stime sys_stime32 __ia32_sys_stime32
40	26 i386 ptrace sys_ptrace __ia32_compat_sys_ptrace	40	26 i386 ptrace sys_ptrace __ia32_compat_sys_ptrace
41	27 i386 alarm sys_alarm __ia32_sys_alarm	41	27 i386 alarm sys_alarm __ia32_sys_alarm
42	28 i386 oldfstat sys_fstat __ia32_sys_fstat	42	28 i386 oldfstat sys_fstat __ia32_sys_fstat
43	29 i386 pause sys_pause __ia32_sys_pause	43	29 i386 pause sys_pause __ia32_sys_pause
44	30 i386 utime sys_utime __ia32_sys_utime32	44	30 i386 utime sys_utime32 __ia32_sys_utime32
45	31 i386 stty	45	31 i386 stty
46	32 i386 gtty	46	32 i386 gtty
47	33 i386 access sys_access __ia32_sys_access	47	33 i386 access sys_access __ia32_sys_access
@@ -282,7 +282,7 @@ · 234 unmodified lines
282	268 i386 statfs64 sys_statfs64 __ia32_compat_sys_statfs64	282	268 i386 statfs64 sys_statfs64 __ia32_compat_sys_statfs64
283	269 i386 fstatfs64 sys_fstatfs64 __ia32_compat_sys_fstatfs64	283	269 i386 fstatfs64 sys_fstatfs64 __ia32_compat_sys_fstatfs64
284	270 i386 tgkill sys_tgkill __ia32_sys_tgkill	284	270 i386 tgkill sys_tgkill __ia32_sys_tgkill
285	271 i386 utimes sys_utimes __ia32_sys_utimes_time32	285	271 i386 utimes sys_utimes_time32 __ia32_sys_utimes_time32
286	272 i386 fadvise64_64 sys_fadvise64_64 __ia32_compat_sys_x86_fadvise64_64	286	272 i386 fadvise64_64 sys_fadvise64_64 __ia32_compat_sys_x86_fadvise64_64
287	273 i386 vserver	287	273 i386 vserver
288	274 i386 mbind sys_mbind __ia32_sys_mbind	288	274 i386 mbind sys_mbind __ia32_sys_mbind
@@ -310,7 +310,7 @@ · 21 unmodified lines
310	296 i386 mkdirat sys_mkdirat __ia32_sys_mkdirat	310	296 i386 mkdirat sys_mkdirat __ia32_sys_mkdirat
311	297 i386 mknodat sys_mknodat __ia32_sys_mknodat	311	297 i386 mknodat sys_mknodat __ia32_sys_mknodat
312	298 i386 fchownat sys_fchownat __ia32_sys_fchownat	312	298 i386 fchownat sys_fchownat __ia32_sys_fchownat
313	299 i386 futimesat sys_futimesat __ia32_sys_futimesat_time32	313	299 i386 futimesat sys_futimesat_time32 __ia32_sys_futimesat_time32
314	300 i386 fstatat64 sys_fstatat64 __ia32_compat_sys_x86_fstatat	314	300 i386 fstatat64 sys_fstatat64 __ia32_compat_sys_x86_fstatat
315	301 i386 unlinkat sys_unlinkat __ia32_sys_unlinkat	315	301 i386 unlinkat sys_unlinkat __ia32_sys_unlinkat
316	302 i386 renameat sys_renameat __ia32_sys_renameat	316	302 i386 renameat sys_renameat __ia32_sys_renameat

@@ -23,8 +23,8 @@ · 22 unmodified lines
23		23
24	# include <asm/unistd_64.h>	24	# include <asm/unistd_64.h>
25	# include <asm/unistd_64_x32.h>	25	# include <asm/unistd_64_x32.h>
26	# define __ARCH_WANT_COMPAT_SYS_TIME	26	# define __ARCH_WANT_SYS_TIME
27	# define __ARCH_WANT_SYS_UTIME32	27	# define __ARCH_WANT_SYS_UTIME
28	# define __ARCH_WANT_COMPAT_SYS_PREADV64	28	# define __ARCH_WANT_COMPAT_SYS_PREADV64
29	# define __ARCH_WANT_COMPAT_SYS_PWRITEV64	29	# define __ARCH_WANT_COMPAT_SYS_PWRITEV64
30	# define __ARCH_WANT_COMPAT_SYS_PREADV64V2	30	# define __ARCH_WANT_COMPAT_SYS_PREADV64V2
@@ -48,8 +48,8 @@ · 17 unmodified lines
48	# define __ARCH_WANT_SYS_SIGPENDING	48	# define __ARCH_WANT_SYS_SIGPENDING
49	# define __ARCH_WANT_SYS_SIGPROCMASK	49	# define __ARCH_WANT_SYS_SIGPROCMASK
50	# define __ARCH_WANT_SYS_SOCKETCALL	50	# define __ARCH_WANT_SYS_SOCKETCALL
51	# define __ARCH_WANT_SYS_TIME	51	# define __ARCH_WANT_SYS_TIME32
52	# define __ARCH_WANT_SYS_UTIME	52	# define __ARCH_WANT_SYS_UTIME32
53	# define __ARCH_WANT_SYS_WAITPID	53	# define __ARCH_WANT_SYS_WAITPID
54	# define __ARCH_WANT_SYS_FORK	54	# define __ARCH_WANT_SYS_FORK
55	# define __ARCH_WANT_SYS_VFORK	55	# define __ARCH_WANT_SYS_VFORK