| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | Description: Fix build failure with new kernel 4.18 |
| 2 | Author: Gianfranco Costamagna <locutusofborg@debian.org> |
| 3 | |
| 4 | Upstream-Status:Pending |
| 5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 6 | Index: vbox_module/vboxsf/utils.c |
| 7 | =================================================================== |
| 8 | --- vbox_module.orig/vboxsf/utils.c |
| 9 | +++ vbox_module/vboxsf/utils.c |
| 10 | @@ -50,7 +50,11 @@ static void sf_timespec_from_ftime(RTTIM |
| 11 | RTTimeSpecSetNano(ts, t); |
| 12 | } |
| 13 | #else /* >= 2.6.0 */ |
| 14 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) |
| 15 | static void sf_ftime_from_timespec(struct timespec *tv, RTTIMESPEC *ts) |
| 16 | +#else |
| 17 | +static void sf_ftime_from_timespec(struct timespec64 *tv, RTTIMESPEC *ts) |
| 18 | +#endif |
| 19 | { |
| 20 | int64_t t = RTTimeSpecGetNano(ts); |
| 21 | int64_t nsec; |
| 22 | @@ -60,7 +64,11 @@ static void sf_ftime_from_timespec(struc |
| 23 | tv->tv_nsec = nsec; |
| 24 | } |
| 25 | |
| 26 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) |
| 27 | static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec *tv) |
| 28 | +#else |
| 29 | +static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec64 *tv) |
| 30 | +#endif |
| 31 | { |
| 32 | int64_t t = (int64_t)tv->tv_nsec + (int64_t)tv->tv_sec * 1000000000; |
| 33 | RTTimeSpecSetNano(ts, t); |