Commit 2c221325 authored Jun 03, 2016 by Linus Torvalds

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

parents e603330c dfc2507b

include/linux/timekeeping.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -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);