diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-04 01:37:27 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-04 01:37:27 +0300 |
| commit | 2c221325635ed09a6eea10a362d8514d5943ad7d (patch) | |
| tree | fd4f3aafa91c01be7e1cea072b2991c1f8516a92 | |
| parent | e603330c867fea506ea861892bd28d963c07c978 (diff) | |
| parent | dfc2507b26af22b0bbc85251b8545b36d8bc5d72 (diff) | |
| download | linux-2c221325635ed09a6eea10a362d8514d5943ad7d.tar.xz | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer bugfix from Thomas Gleixner:
"A single bugfix for the error check wreckage we introduced in the
merge window"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
time: Make settimeofday error checking work again
| -rw-r--r-- | include/linux/timekeeping.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h index 37dbacf84849..816b7543f81b 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -21,6 +21,9 @@ static inline int do_sys_settimeofday(const struct timespec *tv, struct timespec64 ts64; if (!tv) + return do_sys_settimeofday64(NULL, tz); + + if (!timespec_valid(tv)) return -EINVAL; ts64 = timespec_to_timespec64(*tv); |