From nobody Mon Oct 3 05:16:45 2022
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 4MgpwZ0sLqz4V5Yx;
Mon, 3 Oct 2022 05:16: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 4MgpwZ0FbMz3NLS;
Mon, 3 Oct 2022 05:16:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1664774206;
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=pc1Rs9+k9JJjLrTVj70twwbXg8zL99x0NSeUze1JPGY=;
b=QsmoJJlgReFIoDFKZ3phAg0vY+jpRWJjisrs9OsNgk00Z2Bj+n/uQocZZS7WkP22VweB1M
Po6RdtXTSP80PROpw177Qc3Tew87vOkGRrvIgA7izR6UuWFS/rfqgm3k1+Y39rJZLWxh8f
si5kKZe9yd0ff2mG1KLbvLN66Mwn9OeqOG8gJ5AlyqQrtUW+vkHjc084LDj9jExlPEbZkd
RrU+dASmmVlIns2Eq/2lnLswJtnbr0K4A4MFM2R7fdDj+hUzu7+GhLFwWAvgdtJ3xyXyWP
1BloAdJOKv24GRv/GXdn0kTH+doAxXiEq1wTfv3amrhEzfCThC9+/o8t2I0H2Q==
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 4MgpwY6Mv4z15t2;
Mon, 3 Oct 2022 05:16:45 +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 2935Gj7X015516;
Mon, 3 Oct 2022 05:16:45 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2935GjIb015515;
Mon, 3 Oct 2022 05:16:45 GMT
(envelope-from git)
Date: Mon, 3 Oct 2022 05:16:45 GMT
Message-Id: <202210030516.2935GjIb015515@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Doug Moore <dougm@FreeBSD.org>
Subject: git: ffbc2a58b13a - main - Fix LINT build after 368ee2f86a0f4f6 Reported by: jenkins Fixes: 368ee2f86a0f4f6
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-all@freebsd.org
X-BeenThere: dev-commits-src-all@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: dougm
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: ffbc2a58b13a9239269e661fe23f86c587cc7638
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1664774206;
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=pc1Rs9+k9JJjLrTVj70twwbXg8zL99x0NSeUze1JPGY=;
b=RILmbF7UzmNnl/JO0Df6vNFQNNX5oYzg7RpuF26qdNT8/47ukAIVJihN1Qa1nl9roue4/D
7dqlaKQp7Tg3zUH/JQ/s6Q6o28WSGVlMv8X0kmwFscVHRVSNJKmnx/qyJ08bTQ5OukqY2c
IwbZnRrWLhCyqTCE2cuWtMoPFLjqNzlZZHkySWXMXUfMmdQheRCkqlQTMg3Z6qaUwLl2AC
Djdn1f5o9CovggZHrWgSTTDmERAHK+CpOwC0CIN+xcM1AT0odeWq4jAppiEuIJEgHdQcfw
QUjFOxCxCeJddriEZZarQjMHcMSVplQmqfZJg824ahniET0NRtSv9XjQtFYRmQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664774206; a=rsa-sha256; cv=none;
b=Cb+FuJSsODhXs0Ayg7yQ2zXeH+r2wii7uHqzKqSZ+N7ekMuezdbQGEFycuGNT/j3yynrZ4
u6UFBcDNUXRL9z2anKTAOi4FhuS5RSXrltr9V5/Lswc3dEZMkWhLK6mu1UXNMAfs2rsbje
flKJrbllyHJ78D+phQwEefE/eCJBk8tlJyfvggabRB+W8S/47nZRasqG1IJ/I1VHNK/sL1
IVZc8Dw0Uc1c+r6c5xJJqAv7voL7DXndEl8bqRsnogHnMy2EN49Y3p28EfHby1Q7CKB2Iq
OnmEi0mEt512NhQtl7iOpx3nWVnb/CcuC4FY6I+OKcfRr7viddsWjbjsbbqRSw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by dougm:
URL: https://cgit.FreeBSD.org/src/commit/?id=ffbc2a58b13a9239269e661fe23f86c587cc7638
commit ffbc2a58b13a9239269e661fe23f86c587cc7638
Author: Doug Moore <dougm@FreeBSD.org>
AuthorDate: 2022-10-03 05:15:21 +0000
Commit: Doug Moore <dougm@FreeBSD.org>
CommitDate: 2022-10-03 05:15:21 +0000
Fix LINT build after 368ee2f86a0f4f6
Reported by: jenkins
Fixes: 368ee2f86a0f4f6
---
sys/sys/tree.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/sys/sys/tree.h b/sys/sys/tree.h
index 1206e5280a85..edd32d9dec2a 100644
--- a/sys/sys/tree.h
+++ b/sys/sys/tree.h
@@ -920,11 +920,11 @@ name##_RB_NEXT(struct type *elm) \
}
#if defined(_KERNEL) && defined(DIAGNOSTIC)
-#define _RB_ORDER_CHECK(lo, hi) do { \
- KASSERT(cmp(lo, hi) < 0, "out of order insertion"); \
+#define _RB_ORDER_CHECK(cmp, lo, hi) do { \
+ KASSERT((cmp)(lo, hi) < 0, ("out of order insertion")); \
} while (0)
#else
-#define _RB_ORDER_CHECK(elm, next) do {} while (0)
+#define _RB_ORDER_CHECK(cmp, lo, hi) do {} while (0)
#endif
#define RB_GENERATE_INSERT_NEXT(name, type, field, cmp, attr) \
@@ -936,9 +936,9 @@ name##_RB_INSERT_NEXT(struct name *head, \
struct type *tmp; \
struct type **tmpp = &RB_RIGHT(elm, field); \
\
- _RB_ORDER_CHECK(elm, next); \
+ _RB_ORDER_CHECK(cmp, elm, next); \
if (name##_RB_NEXT(elm) != NULL) \
- _RB_ORDER_CHECK(next, name##_RB_NEXT(elm)); \
+ _RB_ORDER_CHECK(cmp, next, name##_RB_NEXT(elm)); \
while ((tmp = *tmpp) != NULL) { \
elm = tmp; \
tmpp = &RB_LEFT(elm, field); \
@@ -973,9 +973,9 @@ name##_RB_INSERT_PREV(struct name *head, \
struct type *tmp; \
struct type **tmpp = &RB_LEFT(elm, field); \
\
- _RB_ORDER_CHECK(prev, elm); \
+ _RB_ORDER_CHECK(cmp, prev, elm); \
if (name##_RB_PREV(elm) != NULL) \
- _RB_ORDER_CHECK(name##_RB_PREV(elm), prev); \
+ _RB_ORDER_CHECK(cmp, name##_RB_PREV(elm), prev); \
while ((tmp = *tmpp) != NULL) { \
elm = tmp; \
tmpp = &RB_RIGHT(elm, field); \