From nobody Tue Jul 22 16:02:58 2025 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 4bmhr25Ffcz5pZdm; Tue, 22 Jul 2025 16:02:58 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bmhr22H07z3PYq; Tue, 22 Jul 2025 16:02:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753200178; 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=Qf3HWOTd5GASHKC68fL2EAyqW/ga0LDM9DjQ2E2VYzg=; b=dt1TXAOcECCmBx2rdd+nbT6nGVeDgdd+gWVPXlwrpVzECFWtySH6ZXMRySYKNhfFWLYB6N DW+CKcjGtQa1lm01jaNCaG0vYHJgrPiVCV5f+U6qH5SmdC1L/eR2nBwq36YVSLGKRUwwjd NJEjRiwjfLFQLtYcvyksGseWsOeiqS7GHXIcNZzsFBwuQTbKbMMoc6x1JWQSqV7wXzZYgz yR3THamxUJp/nDDQBE8frZ870cSnUyo17CQvppfHQjOS7SoQYVGAvnlVwmZyT+EjfVTd+E QsMuHwJyPqBQZdDY4GBkngWzQYBdooFcFwPd9736Q1BRUNl28p1ZtjcK8uHR5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753200178; 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=Qf3HWOTd5GASHKC68fL2EAyqW/ga0LDM9DjQ2E2VYzg=; b=yI2HRClvjT90vXN5/gf3n+jsJqHhwXUEkCcGPhIiFixVH/Pnr2GsNJz5Om4e3iJ5VSOGzk 96zpYD7r9EJDbu00kxHs2fiVeMR15Fu1Pk3lXkw2u605/wDRwjBQ2tUgBKEVfyyZtKXhbg qOHtxmf5TNlskuVyo6UITwLOveOCrsB2iNPCp9K4ZFYq0/oL4FqMXfY3qoOrKEIwNYmc/q KdSi5Q4emV8R58fOgn6oxst9kyFHCli1iLGggX/1fRtnFSheeZ9/T7dy5qbdCFmqp/Tt6+ EplkE22CFIrAoap5TPQ2K9gpX/c4vO8US6/8HS21YQMkZ6m94iOgfbPJB74+nQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753200178; a=rsa-sha256; cv=none; b=PkxT1LjZpJdPLpazTyEtNWhsMY+54re6pRA8nZdTsiVg7Q8SNFg1H4I/O3qfJ6zaGHpETQ TKaaEWxF823lyrT8P32ARqkjKHyhYFE2I/HH+AgtHJ3xZDEV5UHv0X5f1y3ni9m4pXHptd ZZ2w9KnSpsfchmKaa0eHwktmYz5CTYMDMpH8nmCDJcSosQs6SxsEcLGi4fCiPmKq5ycxTm aDisNpaPpysdH+H/X5cC5J44A2DdUm62Fi5icClxp/uy7G8hFjNcIj6eDiHpSSUmGcSoCF ocWQKsH4unmEOz89r/pyWS6whx9+31rDeAIMczPkkwWUz7KklFhaKH9QIvzRSA== 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 4bmhr21cDgzb3t; Tue, 22 Jul 2025 16:02:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56MG2wDQ097363; Tue, 22 Jul 2025 16:02:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56MG2wB5097360; Tue, 22 Jul 2025 16:02:58 GMT (envelope-from git) Date: Tue, 22 Jul 2025 16:02:58 GMT Message-Id: <202507221602.56MG2wB5097360@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b84dd938c913 - stable/14 - linuxkpi: Remove incorrect + 1 from HWEIGHT* macros 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b84dd938c9130a0416a5c55fc0d012ecafc5b231 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b84dd938c9130a0416a5c55fc0d012ecafc5b231 commit b84dd938c9130a0416a5c55fc0d012ecafc5b231 Author: Ed Maste AuthorDate: 2025-06-24 13:36:54 +0000 Commit: Ed Maste CommitDate: 2025-07-22 15:59:55 +0000 linuxkpi: Remove incorrect + 1 from HWEIGHT* macros Fixes: 4cc8a9da491d ("LinuxKPI: add HWEIGHT32()") Reviewed by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51010 (cherry picked from commit cdbff1b2999660b31b2de076d04670722a555ed2) --- sys/compat/linuxkpi/common/include/linux/bitops.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/bitops.h b/sys/compat/linuxkpi/common/include/linux/bitops.h index 1415d5224084..2af891791130 100644 --- a/sys/compat/linuxkpi/common/include/linux/bitops.h +++ b/sys/compat/linuxkpi/common/include/linux/bitops.h @@ -62,10 +62,10 @@ #define hweight64(x) bitcount64(x) #define hweight_long(x) bitcountl(x) -#define HWEIGHT8(x) (bitcount8((uint8_t)(x)) + 1) -#define HWEIGHT16(x) (bitcount16(x) + 1) -#define HWEIGHT32(x) (bitcount32(x) + 1) -#define HWEIGHT64(x) (bitcount64(x) + 1) +#define HWEIGHT8(x) (bitcount8((uint8_t)(x))) +#define HWEIGHT16(x) (bitcount16(x)) +#define HWEIGHT32(x) (bitcount32(x)) +#define HWEIGHT64(x) (bitcount64(x)) static inline int __ffs(int mask)