From nobody Fri Jun 17 19:40:09 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7327C85CB99; Fri, 17 Jun 2022 19:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPqBg0BWgz3hH2; Fri, 17 Jun 2022 19:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ukUL8s/E/YyrJ7ZqYB8Hx1TmKJcsxQtpIKXiO6KEDtY=; b=AzYszgXLWIOceQjp+drh+HF0YFcGjoBKJTYMv8afXOFo5PzXbQSAp/LhUP2Q64UlppTffO wIu4/Uz5cnbXlmWMywqO+k1dyaA2SXTGHotpUJ2NnOaTkCPKiBTx/aIlns83cBCGpxyzTw zsqvWlQYbWBvcv4WQYckJic+M3eM+9jGCSxqaRmIOpUf/GXMLfbPuHQcGw8v5tNfLVcQkB W3txscUISDiFA4T66N4jQ/Fvqo7hi4FZh/9ZdzLotFDvh+MevwMqA+cWruL/6GZUtCzKqF VgsaeSeHSyDlF14foMjHoS8BEAzIUM6ahnEjR43qibnYXKa9ZZBW0zJypYLMig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5128325D12; Fri, 17 Jun 2022 19:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25HJe96e020141; Fri, 17 Jun 2022 19:40:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJe9K6020139; Fri, 17 Jun 2022 19:40:09 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:09 GMT Message-Id: <202206171940.25HJe9K6020139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 12b9d651a8a2 - stable/13 - linux(4): Use the right function to get the bit index in vdso binuptime. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 12b9d651a8a2c17b3c27e8e3be7aec94f14face8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ukUL8s/E/YyrJ7ZqYB8Hx1TmKJcsxQtpIKXiO6KEDtY=; b=VvHZ962Ce6lnLQbJOIp01HkUV5ClWSeAa9kEudd27T6uk9SIW4IZU9eW0JRvfV/S4lA/qe 6SBrRccyu/VTE7OoWBWlI07KlT9nmoqwHs2YEdlfvNLr5bV22HhpToovPgJV4VxrpXBVCW BOKHDSGBTGqwf5EeV9eYzorkTf1gxRZIhdxJTocQRmb3e2W+ZuwsnEdbUPyw0nj1AkDXjt Y6Md0xuqBebQAS2tGHfmGLR48p1Ewhorh/a0qI9BKDb7nDTyX6+r49icg89wqSTMLVtPSq rNZeQyk5bGWWYhLReoD+GIpH6VNUejzyfy1yinHAtABPX5w4kgjEpl0CPgc4Pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494812; a=rsa-sha256; cv=none; b=oNn2VMfi3EZKbq5KoWOu4yNf3cDGqfCZHQACqxDwf50Pzt9ir5IK/VU8axmaMkYEupwRIl otyq/0cunvCoHuZvbH+qnNN1C4KlU2hHdso97vXTyLjaYk+LmpqtrapstJ+DeDfZLFhKKx xaUsfWwYHXezAscC5vfaHNJw8qa8l9vXPKYlRZpG/zon2Snq1GDp91BeLMGxMEwPOilpbc xH5yUv4qJde0juNvSVdy/xDEhRu8ukkVnk1gJwlfkTR9Ibo3nsQ/ewBQCQBmj/UJjdbIxZ de/5a3VzHFXS4DDy6pJzflSRrqlpq8AqyEgxEmNgklXe8mgMCmUXXjLCE4Z95g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=12b9d651a8a2c17b3c27e8e3be7aec94f14face8 commit 12b9d651a8a2c17b3c27e8e3be7aec94f14face8 Author: Dmitry Chagin AuthorDate: 2022-05-08 14:20:52 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:00 +0000 linux(4): Use the right function to get the bit index in vdso binuptime. This is modeled after a1f93266 (by kib@). MFC after: 2 weeks (cherry picked from commit c6df21760381c3e48bcd412705de6f0ded9e4aae) --- sys/compat/linux/linux_vdso_gtod.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/compat/linux/linux_vdso_gtod.inc b/sys/compat/linux/linux_vdso_gtod.inc index 7320ce998d80..f101fe81f7f8 100644 --- a/sys/compat/linux/linux_vdso_gtod.inc +++ b/sys/compat/linux/linux_vdso_gtod.inc @@ -37,25 +37,25 @@ fls(int mask) #ifdef _LP64 static int -ffsl(long mask) +flsl(long mask) { int bit; if (mask == 0) return (0); - for (bit = 1; !(mask & 1); bit++) + for (bit = 1; mask != 1; bit++) mask = (unsigned long)mask >> 1; return (bit); } #else static int -ffsll(long long mask) +flsll(long long mask) { int bit; if (mask == 0) return (0); - for (bit = 1; !(mask & 1); bit++) + for (bit = 1; mask != 1; bit++) mask = (unsigned long long)mask >> 1; return (bit); } @@ -186,9 +186,9 @@ freebsd_binuptime(struct bintime *bt, struct vdso_timekeep *tk, bool abs) return (error); scale = th->th_scale; #ifdef _LP64 - scale_bits = ffsl(scale); + scale_bits = flsl(scale); #else - scale_bits = ffsll(scale); + scale_bits = flsll(scale); #endif if (__predict_false(scale_bits + fls(delta) > 63)) { x = (scale >> 32) * delta;