Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

y2038: remove CONFIG_64BIT_TIME

The CONFIG_64BIT_TIME option is defined on all architectures, and can
be removed for simplicity now.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+6 -14
-8
arch/Kconfig
··· 796 796 config COMPAT_OLD_SIGACTION 797 797 bool 798 798 799 - config 64BIT_TIME 800 - def_bool y 801 - help 802 - This should be selected by all architectures that need to support 803 - new system calls with a 64-bit time_t. This is relevant on all 32-bit 804 - architectures, and 64-bit architectures as part of compat syscall 805 - handling. 806 - 807 799 config COMPAT_32BIT_TIME 808 800 def_bool !64BIT || COMPAT 809 801 help
+1 -1
fs/aio.c
··· 2056 2056 * specifies an infinite timeout. Note that the timeout pointed to by 2057 2057 * timeout is relative. Will fail with -ENOSYS if not implemented. 2058 2058 */ 2059 - #if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT) 2059 + #ifdef CONFIG_64BIT 2060 2060 2061 2061 SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id, 2062 2062 long, min_nr,
+1 -1
ipc/syscall.c
··· 30 30 return ksys_semtimedop(first, (struct sembuf __user *)ptr, 31 31 second, NULL); 32 32 case SEMTIMEDOP: 33 - if (IS_ENABLED(CONFIG_64BIT) || !IS_ENABLED(CONFIG_64BIT_TIME)) 33 + if (IS_ENABLED(CONFIG_64BIT)) 34 34 return ksys_semtimedop(first, ptr, second, 35 35 (const struct __kernel_timespec __user *)fifth); 36 36 else if (IS_ENABLED(CONFIG_COMPAT_32BIT_TIME))
+1 -1
kernel/time/hrtimer.c
··· 1940 1940 return ret; 1941 1941 } 1942 1942 1943 - #if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT) 1943 + #ifdef CONFIG_64BIT 1944 1944 1945 1945 SYSCALL_DEFINE2(nanosleep, struct __kernel_timespec __user *, rqtp, 1946 1946 struct __kernel_timespec __user *, rmtp)
+2 -2
kernel/time/time.c
··· 267 267 } 268 268 #endif 269 269 270 - #if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT) 270 + #ifdef CONFIG_64BIT 271 271 SYSCALL_DEFINE1(adjtimex, struct __kernel_timex __user *, txc_p) 272 272 { 273 273 struct __kernel_timex txc; /* Local copy of parameter */ ··· 881 881 ts->tv_sec = kts.tv_sec; 882 882 883 883 /* Zero out the padding for 32 bit systems or in compat mode */ 884 - if (IS_ENABLED(CONFIG_64BIT_TIME) && in_compat_syscall()) 884 + if (in_compat_syscall()) 885 885 kts.tv_nsec &= 0xFFFFFFFFUL; 886 886 887 887 ts->tv_nsec = kts.tv_nsec;
+1 -1
net/socket.c
··· 2833 2833 a[2], true); 2834 2834 break; 2835 2835 case SYS_RECVMMSG: 2836 - if (IS_ENABLED(CONFIG_64BIT) || !IS_ENABLED(CONFIG_64BIT_TIME)) 2836 + if (IS_ENABLED(CONFIG_64BIT)) 2837 2837 err = __sys_recvmmsg(a0, (struct mmsghdr __user *)a1, 2838 2838 a[2], a[3], 2839 2839 (struct __kernel_timespec __user *)a[4],