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>

diff --git a/arch/Kconfig b/arch/Kconfig
index 5f8a5d84dbbe9257f0a2a33c3ed81687a4eb0aad..0e1fded2940e4777262040adf06335ba255da78b 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -796,14 +796,6 @@ config OLD_SIGACTION
 config COMPAT_OLD_SIGACTION
        bool
 
-config 64BIT_TIME
-       def_bool y
-       help
-         This should be selected by all architectures that need to support
-         new system calls with a 64-bit time_t. This is relevant on all 32-bit
-         architectures, and 64-bit architectures as part of compat syscall
-         handling.
-
 config COMPAT_32BIT_TIME
        def_bool !64BIT || COMPAT
        help

diff --git a/fs/aio.c b/fs/aio.c
index 01e0fb9ae45aed3b1e10b3bfe25b878f393e0ab6..447e3a0c572c66e5ed79c3b497800aec83a0f4d2 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -2056,7 +2056,7 @@ static long do_io_getevents(aio_context_t ctx_id,
  *     specifies an infinite timeout. Note that the timeout pointed to by
  *     timeout is relative.  Will fail with -ENOSYS if not implemented.
  */
-#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT)
+#ifdef CONFIG_64BIT
 
 SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id,
                long, min_nr,

diff --git a/ipc/syscall.c b/ipc/syscall.c
index 581bdff4e7c5129692c0ccacc00ba91074218479..dfb0e988d542b2c3e713af21ef0451c0c35b9a74 100644 (file)
--- a/ipc/syscall.c
+++ b/ipc/syscall.c
@@ -30,7 +30,7 @@ int ksys_ipc(unsigned int call, int first, unsigned long second,
                return ksys_semtimedop(first, (struct sembuf __user *)ptr,
                                       second, NULL);
        case SEMTIMEDOP:
-               if (IS_ENABLED(CONFIG_64BIT) || !IS_ENABLED(CONFIG_64BIT_TIME))
+               if (IS_ENABLED(CONFIG_64BIT))
                        return ksys_semtimedop(first, ptr, second,
                                (const struct __kernel_timespec __user *)fifth);
                else if (IS_ENABLED(CONFIG_COMPAT_32BIT_TIME))

diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 65605530ee349c9682690c4fccb43aa9284d4287..9e20873148c616938845699ebe3b797cee962a0a 100644 (file)
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1940,7 +1940,7 @@ long hrtimer_nanosleep(const struct timespec64 *rqtp,
        return ret;
 }
 
-#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT)
+#ifdef CONFIG_64BIT
 
 SYSCALL_DEFINE2(nanosleep, struct __kernel_timespec __user *, rqtp,
                struct __kernel_timespec __user *, rmtp)

diff --git a/kernel/time/time.c b/kernel/time/time.c
index 5c54ca632d08c0a5bf862b1c499faeb17bec1dc6..96b8c02657ed7f8da7d0a1d7bbcdcc5de0543135 100644 (file)
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
@@ -267,7 +267,7 @@ COMPAT_SYSCALL_DEFINE2(settimeofday, struct old_timeval32 __user *, tv,
 }
 #endif
 
-#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT)
+#ifdef CONFIG_64BIT
 SYSCALL_DEFINE1(adjtimex, struct __kernel_timex __user *, txc_p)
 {
        struct __kernel_timex txc;              /* Local copy of parameter */
@@ -881,7 +881,7 @@ int get_timespec64(struct timespec64 *ts,
        ts->tv_sec = kts.tv_sec;
 
        /* Zero out the padding for 32 bit systems or in compat mode */
-       if (IS_ENABLED(CONFIG_64BIT_TIME) && in_compat_syscall())
+       if (in_compat_syscall())
                kts.tv_nsec &= 0xFFFFFFFFUL;
 
        ts->tv_nsec = kts.tv_nsec;

diff --git a/net/socket.c b/net/socket.c
index 6a9ab7a8b1d2c5059752a9147c2f0fd1aea4f44d..98f6544b0096aecc9e9dce58069aedd532321570 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -2833,7 +2833,7 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
                                    a[2], true);
                break;
        case SYS_RECVMMSG:
-               if (IS_ENABLED(CONFIG_64BIT) || !IS_ENABLED(CONFIG_64BIT_TIME))
+               if (IS_ENABLED(CONFIG_64BIT))
                        err = __sys_recvmmsg(a0, (struct mmsghdr __user *)a1,
                                             a[2], a[3],
                                             (struct __kernel_timespec __user *)a[4],