p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Arnd Bergmann 2019-04-23 17:43:50 +02:00
parent a99d8080aa
commit 3ca47e958a
6 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/Kconfig
View File

@ -796,14 +796,6 @@ config OLD_SIGACTION
config COMPAT_OLD_SIGACTION config COMPAT_OLD_SIGACTION
bool 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 config COMPAT_32BIT_TIME
def_bool !64BIT || COMPAT def_bool !64BIT || COMPAT
help help

2
fs/aio.c
View File

@ -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 * specifies an infinite timeout. Note that the timeout pointed to by
* timeout is relative. Will fail with -ENOSYS if not implemented. * 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, SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id,
long, min_nr, long, min_nr,

2
ipc/syscall.c
View File

@ -30,7 +30,7 @@ int ksys_ipc(unsigned int call, int first, unsigned long second,
return ksys_semtimedop(first, (struct sembuf __user *)ptr, return ksys_semtimedop(first, (struct sembuf __user *)ptr,
second, NULL); second, NULL);
case SEMTIMEDOP: case SEMTIMEDOP:
if (IS_ENABLED(CONFIG_64BIT) || !IS_ENABLED(CONFIG_64BIT_TIME)) if (IS_ENABLED(CONFIG_64BIT))
return ksys_semtimedop(first, ptr, second, return ksys_semtimedop(first, ptr, second,
(const struct __kernel_timespec __user *)fifth); (const struct __kernel_timespec __user *)fifth);
else if (IS_ENABLED(CONFIG_COMPAT_32BIT_TIME)) else if (IS_ENABLED(CONFIG_COMPAT_32BIT_TIME))

2
kernel/time/hrtimer.c
View File

@ -1940,7 +1940,7 @@ long hrtimer_nanosleep(const struct timespec64 *rqtp,
return ret; return ret;
} }
#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT) #ifdef CONFIG_64BIT
SYSCALL_DEFINE2(nanosleep, struct __kernel_timespec __user *, rqtp, SYSCALL_DEFINE2(nanosleep, struct __kernel_timespec __user *, rqtp,
struct __kernel_timespec __user *, rmtp) struct __kernel_timespec __user *, rmtp)

4
kernel/time/time.c
View File

@ -267,7 +267,7 @@ COMPAT_SYSCALL_DEFINE2(settimeofday, struct old_timeval32 __user *, tv,
} }
#endif #endif
#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT) #ifdef CONFIG_64BIT
SYSCALL_DEFINE1(adjtimex, struct __kernel_timex __user *, txc_p) SYSCALL_DEFINE1(adjtimex, struct __kernel_timex __user *, txc_p)
{ {
struct __kernel_timex txc; /* Local copy of parameter */ struct __kernel_timex txc; /* Local copy of parameter */
@ -881,7 +881,7 @@ int get_timespec64(struct timespec64 *ts,
ts->tv_sec = kts.tv_sec; ts->tv_sec = kts.tv_sec;
/* Zero out the padding for 32 bit systems or in compat mode */ /* 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; kts.tv_nsec &= 0xFFFFFFFFUL;
ts->tv_nsec = kts.tv_nsec; ts->tv_nsec = kts.tv_nsec;

2
net/socket.c
View File

@ -2833,7 +2833,7 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
a[2], true); a[2], true);
break; break;
case SYS_RECVMMSG: 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, err = __sys_recvmmsg(a0, (struct mmsghdr __user *)a1,
a[2], a[3], a[2], a[3],
(struct __kernel_timespec __user *)a[4], (struct __kernel_timespec __user *)a[4],