diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
| commit | ea4d65f14f6aaa53e379b93c5544245ef081b3e7 (patch) | |
| tree | a15485f4f1cf547a52b31fa8e16e14b9579b7200 /include/linux/time.h | |
| parent | ce32d59ee2cd036f6e8a6ed17a06a0b0bec5c67c (diff) | |
| parent | 496f3347d834aec91c38b45d6249ed00f58ad233 (diff) | |
Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2
Diffstat (limited to 'include/linux/time.h')
| -rw-r--r-- | include/linux/time.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index aed74463592d..27d83fd2ae61 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
| @@ -14,9 +14,9 @@ int get_timespec64(struct timespec64 *ts, | |||
| 14 | int put_timespec64(const struct timespec64 *ts, | 14 | int put_timespec64(const struct timespec64 *ts, |
| 15 | struct __kernel_timespec __user *uts); | 15 | struct __kernel_timespec __user *uts); |
| 16 | int get_itimerspec64(struct itimerspec64 *it, | 16 | int get_itimerspec64(struct itimerspec64 *it, |
| 17 | const struct itimerspec __user *uit); | 17 | const struct __kernel_itimerspec __user *uit); |
| 18 | int put_itimerspec64(const struct itimerspec64 *it, | 18 | int put_itimerspec64(const struct itimerspec64 *it, |
| 19 | struct itimerspec __user *uit); | 19 | struct __kernel_itimerspec __user *uit); |
| 20 | 20 | ||
| 21 | extern time64_t mktime64(const unsigned int year, const unsigned int mon, | 21 | extern time64_t mktime64(const unsigned int year, const unsigned int mon, |
| 22 | const unsigned int day, const unsigned int hour, | 22 | const unsigned int day, const unsigned int hour, |