17e63e8b13
The function ns_to_kernel_old_timeval() has inconsistent declarations:
include/linux/time32.h: ns_to_kernel_old_timeval(s64 nsec);
kernel/time/time.c: ns_to_kernel_old_timeval(const s64 nsec);
This causes the ABI checks to mismatch when generated with LTO=thin
It is fixed upstream in 46dae32fe625 ("time: Correct the prototype
of ns_to_kernel_old_timeval and ns_to_timespec64"), however, since
the android13-5.15 KMI is frozen and assumes "const s64", we can't
use the upstream fix which eliminates "const". Instead use __GENKSYMS__
to fix it for ABI generation.
Fixes: a84d116916 ("y2038: Introduce struct __kernel_old_timeval")
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: I43c74ae1c457607b53a08fbfb67e77f7426bcda7
86 lines
2.3 KiB
C
86 lines
2.3 KiB
C
#ifndef _LINUX_TIME32_H
|
|
#define _LINUX_TIME32_H
|
|
/*
|
|
* These are all interfaces based on the old time_t definition
|
|
* that overflows in 2038 on 32-bit architectures. New code
|
|
* should use the replacements based on time64_t and timespec64.
|
|
*
|
|
* Any interfaces in here that become unused as we migrate
|
|
* code to time64_t should get removed.
|
|
*/
|
|
|
|
#include <linux/time64.h>
|
|
#include <linux/timex.h>
|
|
|
|
#include <vdso/time32.h>
|
|
|
|
struct old_itimerspec32 {
|
|
struct old_timespec32 it_interval;
|
|
struct old_timespec32 it_value;
|
|
};
|
|
|
|
struct old_utimbuf32 {
|
|
old_time32_t actime;
|
|
old_time32_t modtime;
|
|
};
|
|
|
|
struct old_timex32 {
|
|
u32 modes;
|
|
s32 offset;
|
|
s32 freq;
|
|
s32 maxerror;
|
|
s32 esterror;
|
|
s32 status;
|
|
s32 constant;
|
|
s32 precision;
|
|
s32 tolerance;
|
|
struct old_timeval32 time;
|
|
s32 tick;
|
|
s32 ppsfreq;
|
|
s32 jitter;
|
|
s32 shift;
|
|
s32 stabil;
|
|
s32 jitcnt;
|
|
s32 calcnt;
|
|
s32 errcnt;
|
|
s32 stbcnt;
|
|
s32 tai;
|
|
|
|
s32:32; s32:32; s32:32; s32:32;
|
|
s32:32; s32:32; s32:32; s32:32;
|
|
s32:32; s32:32; s32:32;
|
|
};
|
|
|
|
extern int get_old_timespec32(struct timespec64 *, const void __user *);
|
|
extern int put_old_timespec32(const struct timespec64 *, void __user *);
|
|
extern int get_old_itimerspec32(struct itimerspec64 *its,
|
|
const struct old_itimerspec32 __user *uits);
|
|
extern int put_old_itimerspec32(const struct itimerspec64 *its,
|
|
struct old_itimerspec32 __user *uits);
|
|
struct __kernel_timex;
|
|
int get_old_timex32(struct __kernel_timex *, const struct old_timex32 __user *);
|
|
int put_old_timex32(struct old_timex32 __user *, const struct __kernel_timex *);
|
|
|
|
/**
|
|
* ns_to_kernel_old_timeval - Convert nanoseconds to timeval
|
|
* @nsec: the nanoseconds value to be converted
|
|
*
|
|
* Returns the timeval representation of the nsec parameter.
|
|
*/
|
|
#ifndef __GENKSYMS__
|
|
/*
|
|
* There is a mismatch between this signature and the declaration
|
|
* in kernel/time/time.c where the argument actually should be
|
|
* s64, but is declared as const s64 in kernel/time/time.c. Since
|
|
* the KMI expects const, we can't cherry-pick the upstream
|
|
* fix: 46dae32fe625 ("time: Correct the prototype of ns_to_kernel_old_timeval
|
|
* and ns_to_timespec64"). Use __GENKSYMS__ to force CRC to stay
|
|
* constant.
|
|
*/
|
|
extern struct __kernel_old_timeval ns_to_kernel_old_timeval(const s64 nsec);
|
|
#else
|
|
extern struct __kernel_old_timeval ns_to_kernel_old_timeval(s64 nsec);
|
|
#endif
|
|
|
|
#endif
|