Skip to content

Commit fd991a2

Browse files
arndbKAGA-KOKO
authored andcommitted
y2038: Provide aliases for compat helpers
As part of the system call rework for 64-bit time_t, we are restructuring the way that compat syscalls deal with 32-bit time_t, reusing the implementation for 32-bit architectures. Christoph Hellwig suggested a rename of the associated types and interfaces to avoid the confusing usage of the 'compat' prefix for 32-bit architectures. To prepare for doing that in linux-4.20, add a set of macros that allows to convert subsystems separately to the new names and avoids some of the nastier merge conflicts. Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Cc: [email protected] Cc: John Stultz <[email protected]> Cc: Deepa Dinamani <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent f19f5c4 commit fd991a2

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

include/linux/time32.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,4 +207,19 @@ static inline s64 timeval_to_ns(const struct timeval *tv)
207207
extern struct timeval ns_to_timeval(const s64 nsec);
208208
extern struct __kernel_old_timeval ns_to_kernel_old_timeval(s64 nsec);
209209

210+
/*
211+
* New aliases for compat time functions. These will be used to replace
212+
* the compat code so it can be shared between 32-bit and 64-bit builds
213+
* both of which provide compatibility with old 32-bit tasks.
214+
*/
215+
#define old_time32_t compat_time_t
216+
#define old_timeval32 compat_timeval
217+
#define old_timespec32 compat_timespec
218+
#define old_itimerspec32 compat_itimerspec
219+
#define ns_to_old_timeval32 ns_to_compat_timeval
220+
#define get_old_itimerspec32 get_compat_itimerspec64
221+
#define put_old_itimerspec32 put_compat_itimerspec64
222+
#define get_old_timespec32 compat_get_timespec64
223+
#define put_old_timespec32 compat_put_timespec64
224+
210225
#endif

0 commit comments

Comments
 (0)