From owner-svn-src-stable-11@freebsd.org Wed Feb 14 09:53:24 2018
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34F1FF12402;
Wed, 14 Feb 2018 09:53:24 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id DB4D36E312;
Wed, 14 Feb 2018 09:53:23 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D64D7639A;
Wed, 14 Feb 2018 09:53:23 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1E9rN1T087408;
Wed, 14 Feb 2018 09:53:23 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1E9rNQx087407;
Wed, 14 Feb 2018 09:53:23 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201802140953.w1E9rNQx087407@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Wed, 14 Feb 2018 09:53:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r329260 -
stable/11/sys/compat/linuxkpi/common/include/linux
X-SVN-Group: stable-11
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: stable/11/sys/compat/linuxkpi/common/include/linux
X-SVN-Commit-Revision: 329260
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
<svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>,
<mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>,
<mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Feb 2018 09:53:24 -0000
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;
}