From nobody Fri Jun 2 13:17:26 2023 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 4QXk7W1C3Hz4YKQD; Fri, 2 Jun 2023 13:17:27 +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 4QXk7W0SQtz42HK; Fri, 2 Jun 2023 13:17:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685711847; 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=ZeQwk+xS8hUcR2jp0OXmXZe1x7RARn9DhijCZmNzeFc=; b=hgyqykKN/ARXTKIN/Jdc+CqU5BpryrbGYcG+BIKiAbkqpvYxdUFVgZ0ioOj0YUPV1/1key IAk5+l9lNt7LtK1bLuluZ4ua9DsOdpNhby2WikF/ae4kmkClhAGcupvsUp+wCFGeIncXQ9 aRFtvKnDNwFN/nM00DIrNvTGeOLPd9sOXv+lMSp/K5PDcK2lyKHRiJuHRSzU3bXze6jS/F vyC9iA98vXyd787/bbf9lBCJ7k9PtrDA1t8bSfiOgIcpFsuYvy3EeZb02Q9WDQOVry9Yym pNol2h/jewq4okfDgPtgv1PpQ7Husrp9bp3JJLTzmgFwM7zUz4arqjYcmXggTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685711847; 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=ZeQwk+xS8hUcR2jp0OXmXZe1x7RARn9DhijCZmNzeFc=; b=hWuwnNpSLq2qy0+cPkqIgyXlczj0C9tQe8+7ecb4MqE1sNG1gjhtdqPonM1St09Sbk+joa cYIBHwwzQRUuKl+t0Tfz8cSLuqrJfgvQzmmrhg8tyig8mrulRHTfjLzg0lWBHBve4awUI1 VM7ZqIwJnbDlO9ZAnnSQl6fPttrjBoB5zSzN5JWA0FX6hVNhkX3+Qp1tsxtfa8KInY3yj/ ISxe8rzlWj5qSk76lSAN0mF3UWDfFSBuY8rgt2P2lOfCVqcn12Y0mPBP0BNZ/jZCruyJke w7oQPzSTE/h0XIng6X7FEi5K9YA6nMrjIy2048ipggwGgFwoqMB8OJZWo0yrow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685711847; a=rsa-sha256; cv=none; b=ZuA5d98arYvErgcP/TsOuEtuLH0sfALM1/Bimo/Zy68u0vSm/hFCP/GTwt++nAmJ7/XFYm Bwxvk/5mAn9ACw6qz4+HE9k3WNnsnMkyABdMidfHTy+KgJlMeucAGjic4bZSPLlvvEjdtb hYcMqhZ/Wir7PRK4T/R6mTzrMr1vw31oJXL9Udna77KsK4aGEUNQeEOJf1qm46Nuu6/MC3 zk1MdAmFA4r9HmN07bvAadShnfXS4tDCCLzOXvFLsC2kC/SFwqbP1ipUK6wrJFFLcFSGXt f+uzVaPVoF878F3hQ2ZW7B227c7zYsWASuDKzBs+mx4cidWDfGCXoNTwGG4HBg== 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 4QXk7V6dDsz10rx; Fri, 2 Jun 2023 13:17:26 +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 352DHQxk062769; Fri, 2 Jun 2023 13:17:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 352DHQm0062768; Fri, 2 Jun 2023 13:17:26 GMT (envelope-from git) Date: Fri, 2 Jun 2023 13:17:26 GMT Message-Id: <202306021317.352DHQm0062768@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 039be66beb86 - stable/13 - bitset: Remove BITSET_FOREACH_ADVANCE 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 039be66beb868c314ef6158c286d63e9a48a8104 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=039be66beb868c314ef6158c286d63e9a48a8104 commit 039be66beb868c314ef6158c286d63e9a48a8104 Author: Mark Johnston AuthorDate: 2023-05-24 17:05:03 +0000 Commit: Mark Johnston CommitDate: 2023-06-02 13:16:46 +0000 bitset: Remove BITSET_FOREACH_ADVANCE __BITSET_FOREACH_ADVANCE is a helper macro for __BITSET_FOREACH_IS(SET|CLR) and wasn't meant to be used directly by consumers. While here, fix some whitespace and move a comment back to where it belongs. Fixes: 5e04571cf3cf ("sys/bitset.h: reduce visibility of BIT_* macros") MFC after: 1 week (cherry picked from commit 44866dfb44178c86b6f380eb713a8f07c3d3b566) --- sys/sys/bitset.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/sys/bitset.h b/sys/sys/bitset.h index 4952d48b1b3c..b00f33249cb7 100644 --- a/sys/sys/bitset.h +++ b/sys/sys/bitset.h @@ -309,9 +309,6 @@ #define __BITSET_SIZE(_s) (__bitset_words((_s)) * sizeof(long)) #if defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET) -/* - * Dynamically allocate a 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) @@ -328,8 +325,7 @@ #define BIT_FFS_AT(_s, p, start) __BIT_FFS_AT(_s, p, start) #define BIT_FILL(_s, p) __BIT_FILL(_s, p) #define BIT_FLS(_s, p) __BIT_FLS(_s, p) -#define BIT_FOREACH(_s, i, p, op) __BIT_FOREACH(_s, i, p, op) -#define BIT_FOREACH_ADVANCE(_s, i, p, op) __BIT_FOREACH_ADVANCE(_s, i, p, op) +#define BIT_FOREACH(_s, i, p, op) __BIT_FOREACH(_s, i, p, op) #define BIT_FOREACH_ISCLR(_s, i, p) __BIT_FOREACH_ISCLR(_s, i, p) #define BIT_FOREACH_ISSET(_s, i, p) __BIT_FOREACH_ISSET(_s, i, p) #define BIT_ISFULLSET(_s, p) __BIT_ISFULLSET(_s, p) @@ -350,6 +346,9 @@ #define BIT_ZERO(_s, p) __BIT_ZERO(_s, p) #if defined(_KERNEL) +/* + * Dynamically allocate a bitset. + */ #define BITSET_ALLOC(_s, mt, mf) malloc(__BITSET_SIZE((_s)), mt, (mf)) #define BITSET_FREE(p, mt) free(p, mt) #endif /* _KERNEL */