svn commit: r329260 - stable/11/sys/compat/linuxkpi/common/include/linux

[Hans Petter Selasky]

Author: hselasky
Date: Wed Feb 14 09:53:23 2018
New Revision: 329260
URL: https://svnweb.freebsd.org/changeset/base/329260

Log:
  MFC r328971:
  Fix implementation of ktime_add_ns() and ktime_sub_ns() in the LinuxKPI to
  actually return the computed result instead of the input value.
  
  This is a regression issue after r289572.
  
  Found by:	gcc6
  Sponsored by:	Mellanox Technologies

Modified:
  stable/11/sys/compat/linuxkpi/common/include/linux/ktime.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/compat/linuxkpi/common/include/linux/ktime.h
==============================================================================
--- stable/11/sys/compat/linuxkpi/common/include/linux/ktime.h	Wed Feb 14 07:59:30 2018	(r329259)
+++ stable/11/sys/compat/linuxkpi/common/include/linux/ktime.h	Wed Feb 14 09:53:23 2018	(r329260)
@@ -88,18 +88,14 @@ ktime_to_timeval(ktime_t kt)
 static inline ktime_t
 ktime_add_ns(ktime_t kt, int64_t ns)
 {
-	ktime_t res;
-
-	res.tv64 = kt.tv64 + ns;
+	kt.tv64 += ns;
 	return kt;
 }
 
 static inline ktime_t
 ktime_sub_ns(ktime_t kt, int64_t ns)
 {
-	ktime_t res;
-
-	res.tv64 = kt.tv64 - ns;
+	kt.tv64 -= ns;
 	return kt;
 }