From owner-dev-commits-src-branches@freebsd.org Sun Jul 18 00:36:46 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C30B65F548; Sun, 18 Jul 2021 00:36:46 +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 4GS5dT3vKXz4RkX; Sun, 18 Jul 2021 00:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 33BCE1A69A; Sun, 18 Jul 2021 00:36:43 +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 16I0ah03049487; Sun, 18 Jul 2021 00:36:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16I0ahrv049486; Sun, 18 Jul 2021 00:36:43 GMT (envelope-from git) Date: Sun, 18 Jul 2021 00:36:43 GMT Message-Id: <202107180036.16I0ahrv049486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b5519f2ce733 - stable/13 - LinuxKPI: add HWEIGHT32() MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b5519f2ce733deec02e3fd398fe8a02dc6826899 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jul 2021 00:36:46 -0000 The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b5519f2ce733deec02e3fd398fe8a02dc6826899 commit b5519f2ce733deec02e3fd398fe8a02dc6826899 Author: Bjoern A. Zeeb AuthorDate: 2021-05-27 13:09:40 +0000 Commit: Bjoern A. Zeeb CommitDate: 2021-07-18 00:35:03 +0000 LinuxKPI: add HWEIGHT32() Add HWEIGHT32() macro needed by iwlwifi and while here add the 8/16/64 variants likewise. Sponsored by: The FreeBSD Foundation Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D30501 (cherry picked from commit 4cc8a9da491d10f1b4bad6a50730b67dd5e899c7) --- sys/compat/linuxkpi/common/include/linux/bitops.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/bitops.h b/sys/compat/linuxkpi/common/include/linux/bitops.h index 0e25fd3cfb1d..49bfc4cc7414 100644 --- a/sys/compat/linuxkpi/common/include/linux/bitops.h +++ b/sys/compat/linuxkpi/common/include/linux/bitops.h @@ -63,6 +63,11 @@ #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) + static inline int __ffs(int mask) {