[GIT pull] timer fix for 4.7

From	Thomas Gleixner <tglx@linutronix.de>
Newsgroups	linux.kernel
Subject	[GIT pull] timer fix for 4.7
Date	2016-06-03 22:10 +0200
Message-ID	<rG3zP-7MZ-7@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Linus,

please pull the latest timers-urgent-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus

A single bugfix for the error check wreckage we introduced in the merge
window.

Thanks,

	tglx

------------------>
John Stultz (1):
      time: Make settimeofday error checking work again


 include/linux/timekeeping.h | 3 +++
 1 file changed, 3 insertions(+)

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);

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[GIT pull] timer fix for 4.7 Thomas Gleixner <tglx@linutronix.de> - 2016-06-03 22:10 +0200

csiph-web