From nobody Fri Jan 14 18:10:28 2022 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 25B801942B47; Fri, 14 Jan 2022 18:10:30 +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 4Jb8VD59SPz4pP3; Fri, 14 Jan 2022 18:10:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642183828; 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=gXSueNv0lMfwp+RLUuu4aHrsZ8rWMnVBOalbIx7e/sE=; b=mJtD/J9wQDYUn2OgAw/1WkdadveJXUnN3bV4SNGAQNH91qYOY+Z7oYlliIjOnrX+ZLX40W YiMdTk7U9dYKa8Dnw/oe4x3wwpmt3UOCijcYCDOT5GTwt3xJ0fFgPnTfxwSSpFZlzpbPaw vuEyW1brTb2XApH391BkdPQTKy7WHh/razgC1hFSFWGARugey6d7QbzbFRnU875U3nAIrB ZiXtM2uQIwLuKh2iJOWu1C5Lpq4Jsdbc1RqNrCD5ERA9fkO12IaoqS3FKblToHhoy7mYaC PIVKd+zHf+4cA4ubiZufsZtHoxJ7V0rlHNPZ9b2AuX+x+SWg4G7AM/jkfBH0dg== 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 2ABBA181C0; Fri, 14 Jan 2022 18:10:28 +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 20EIAS4k095509; Fri, 14 Jan 2022 18:10:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20EIAS1w095508; Fri, 14 Jan 2022 18:10:28 GMT (envelope-from git) Date: Fri, 14 Jan 2022 18:10:28 GMT Message-Id: <202201141810.20EIAS1w095508@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ca0d97022a52 - stable/13 - sys/_bitset.h: Fix fall-out from commit 5e04571cf3c 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ca0d97022a52501be5374ee39b1b0ef68926ac3b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642183828; 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=gXSueNv0lMfwp+RLUuu4aHrsZ8rWMnVBOalbIx7e/sE=; b=PNNFHyjZiC5Jd+FYvkCUkAImh9spzXYHsgdsZUdXNgjR/hI9ryg51WyjZjyHKVwyYYpXEY e9iijG743WpnUpTtP9Ac7xVnHFNtULwtLAYRlIaXyiB22aCguOMeWbwoAsS1DiPMGR18OT Ya1JtSyz7Tped5h/FjT8nX87LF/b7tbxQCTJdy73YTUL4xztirCIEXB7lI2kcABtc4TIMu riDcavoXG1LfEl1qQaJP9nCpEQjuEgmhTQ2aI4umcrxKOiz8OG5mLLAhhij4v61m6twqkx /eArrUs1zdnQyhRLwkh3mtBbncDYAMZ2GfKNqso8GslOhx1Wh92Ry/uY6uV0BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642183828; a=rsa-sha256; cv=none; b=DChCyz8R5xXHQh96Pi6uy/i6SKLmjiPo9oIZMYHMrpLj4JbqkvaOKv54V8P8ojRMi3pUoh KcECGpYwIKshT/qKxslO0G6UpWjzFVjtVp9sFlr5pgWqTo1kiml0+uK2ex+24EZzXVaWDD I/c1OeCXqbYQiFlnTWGWGbWTXjWA3pSkI/YKuLDcatK7KlTKNzQXa30okYDnyyLz5fPxRW OVQcCScj7UfNdeSu+Nr8nj+lGXJjAV1ibKkynaYLr8QD9/sDsPbizSSCA7zE6xqRPCvTzf ZTCwdhqDG8RlzUNUSQvhq2ZTpZTmcbom3XRUk3ZASu/u4rHNWKi2HOlo2iWVNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ca0d97022a52501be5374ee39b1b0ef68926ac3b commit ca0d97022a52501be5374ee39b1b0ef68926ac3b Author: Stefan Eßer AuthorDate: 2021-12-07 19:29:26 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-14 16:17:30 +0000 sys/_bitset.h: Fix fall-out from commit 5e04571cf3c (cherry picked from commit 22c4ab6cb015dc99eb82504e5fd957662cded3c3) --- sys/sys/bitset.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/bitset.h b/sys/sys/bitset.h index 91a5e6e37db3..47c4106d4127 100644 --- a/sys/sys/bitset.h +++ b/sys/sys/bitset.h @@ -308,12 +308,12 @@ #define __BITSET_SIZE(_s) (__bitset_words((_s)) * sizeof(long)) +#if defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET) /* * Dynamically allocate a bitset. */ #define __BITSET_ALLOC(_s, mt, mf) malloc(__BITSET_SIZE((_s)), mt, (mf)) -#if defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET) #define BIT_AND(_s, d, s) __BIT_AND(_s, d, s) #define BIT_AND2(_s, d, s1, s2) __BIT_AND2(_s, d, s1, s2) #define BIT_ANDNOT(_s, d, s) __BIT_ANDNOT(_s, d, s) @@ -355,6 +355,6 @@ #define BITSET_FSET(n) __BITSET_FSET(n) #define BITSET_SIZE(_s) __BITSET_SIZE(_s) #define BITSET_T_INITIALIZER(x) __BITSET_T_INITIALIZER(x) -#endif +#endif /* defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET) */ #endif /* !_SYS_BITSET_H_ */