From nobody Fri Nov 19 00:02:19 2021 X-Original-To: dev-commits-src-branches@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 4A743188EF58; Fri, 19 Nov 2021 00:02:20 +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 4HwH0W4WY0z4vd0; Fri, 19 Nov 2021 00:02:19 +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 6743C1E536; Fri, 19 Nov 2021 00:02:19 +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 1AJ02JJS072080; Fri, 19 Nov 2021 00:02:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AJ02J6Q072079; Fri, 19 Nov 2021 00:02:19 GMT (envelope-from git) Date: Fri, 19 Nov 2021 00:02:19 GMT Message-Id: <202111190002.1AJ02J6Q072079@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: 3ce981ee8ef7 - stable/13 - LinuxKPI: fix bug in le32p_replace_bits() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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: 3ce981ee8ef7b343779f445ba833d93596edf5d9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3ce981ee8ef7b343779f445ba833d93596edf5d9 commit 3ce981ee8ef7b343779f445ba833d93596edf5d9 Author: Bjoern A. Zeeb AuthorDate: 2021-07-29 21:27:21 +0000 Commit: Bjoern A. Zeeb CommitDate: 2021-11-19 00:01:23 +0000 LinuxKPI: fix bug in le32p_replace_bits() Fix a bug that slipped in in 90707c4e44de03ea36be183ef2226601c66169cb using the correct field in le32p_replace_bits(). Sponsored by: The FreeBSD Foundation (cherry picked from commit 22e20d852ff400a486da24e5d1d92c841a3e39d9) --- sys/compat/linuxkpi/common/include/linux/bitfield.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/bitfield.h b/sys/compat/linuxkpi/common/include/linux/bitfield.h index 27082cbd4886..a805c1bca5a1 100644 --- a/sys/compat/linuxkpi/common/include/linux/bitfield.h +++ b/sys/compat/linuxkpi/common/include/linux/bitfield.h @@ -90,7 +90,7 @@ static __inline void le32p_replace_bits(uint32_t *p, uint32_t v, uint32_t f) { - *p = (*p & ~(cpu_to_le32(v))) | le32_encode_bits(v, f); + *p = (*p & ~(cpu_to_le32(f))) | le32_encode_bits(v, f); } #define __bf_shf(x) (__builtin_ffsll(x) - 1)