Commit 3ca47e95 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parent a99d8080

arch/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -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

fs/aio.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

ipc/syscall.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

kernel/time/hrtimer.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

kernel/time/time.c

+2 −2
Original line number Diff line number Diff line
@@ -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;