-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'uapi-Add-a-new-header-for-time-types'
Deepa Dinamani says: ==================== uapi: Add a new header for time types The series aims at adding a new time header: time_types.h. This header is what will eventually hold all the uapi time types that we plan to leave across the interfaces after the y2038 cleanup. The series was discussed with Arnd Bergmann. The second patch fixes the errqueue.h header, which has a dependency on these types. Note that there may be a trivial merge conflict with linux-next c70a772 ("y2038: remove struct definition redirects"). ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
- Loading branch information
Showing
3 changed files
with
42 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
#ifndef _UAPI_LINUX_TIME_TYPES_H | ||
#define _UAPI_LINUX_TIME_TYPES_H | ||
|
||
#include <linux/types.h> | ||
|
||
#ifndef __kernel_timespec | ||
struct __kernel_timespec { | ||
__kernel_time64_t tv_sec; /* seconds */ | ||
long long tv_nsec; /* nanoseconds */ | ||
}; | ||
#endif | ||
|
||
#ifndef __kernel_itimerspec | ||
struct __kernel_itimerspec { | ||
struct __kernel_timespec it_interval; /* timer period */ | ||
struct __kernel_timespec it_value; /* timer expiration */ | ||
}; | ||
#endif | ||
|
||
/* | ||
* legacy timeval structure, only embedded in structures that | ||
* traditionally used 'timeval' to pass time intervals (not absolute | ||
* times). Do not add new users. If user space fails to compile | ||
* here, this is probably because it is not y2038 safe and needs to | ||
* be changed to use another interface. | ||
*/ | ||
#ifndef __kernel_old_timeval | ||
struct __kernel_old_timeval { | ||
__kernel_long_t tv_sec; | ||
__kernel_long_t tv_usec; | ||
}; | ||
#endif | ||
|
||
struct __kernel_sock_timeval { | ||
__s64 tv_sec; | ||
__s64 tv_usec; | ||
}; | ||
|
||
#endif /* _UAPI_LINUX_TIME_TYPES_H */ |