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:
@@ -1940,7 +1940,7 @@ out:
|
||||
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)
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user