From nobody Mon Oct 24 00:44:05 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 4MwbtF4FLkz4fw6B; Mon, 24 Oct 2022 00:44:05 +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 4MwbtF22hKz3XGg; Mon, 24 Oct 2022 00:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666572245; 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=u40Q4QfuRKzWOnDGJ2A9jqasbqr1ntc4nSoY8V5MV08=; b=bdBDxqjsqoGVE7bZoKcdGazChnhZb9tL+xhnk7UcNv0q4UHYi8cI0We5LW/giZTSslAGL+ iHWQY3xHLgoQlgzZLCYcoFWiGa0SFoBwRyDR28RLTp9+lj7vYuCqDk3fgBUpAY/DXE1lce 6pqcVxBAVcskIpJgaR/NKgHTYV52Y3F5ySQvXx1602l3Czut8x2APQi1UYgOtAzUdEJzI0 p9lZa8yyIpj3ZbVg4RNEWTqJJ+BWjMuPvewV+lcKttA4oXK7+rsSWxHqbWhtf7vQOdBHdU Lqq9kgPFYVvdP7K4pROh6dud0Cm+WfqgkA9R4XS0e6oRF772kTAJwvm2IkFD1w== 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 4MwbtF0jf1z14Jd; Mon, 24 Oct 2022 00:44:05 +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 29O0i5fn082518; Mon, 24 Oct 2022 00:44:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29O0i5oG082517; Mon, 24 Oct 2022 00:44:05 GMT (envelope-from git) Date: Mon, 24 Oct 2022 00:44:05 GMT Message-Id: <202210240044.29O0i5oG082517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: c1d077b80609 - stable/13 - Fix LINT build after 368ee2f86a0f4f6 Reported by: jenkins Fixes: 368ee2f86a0f4f6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: c1d077b80609953601922348be950368e01f2c8a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666572245; 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=u40Q4QfuRKzWOnDGJ2A9jqasbqr1ntc4nSoY8V5MV08=; b=yEYSQGGcKrEfhTiHaH0gX7qGzEbI30GOw1b2YzyGI0VnXUowruT8aLWNUirs1qCsJeo4GB ThubjQAjmD0szW6TvWGcSNwBUvvtxKQuhpGk4C82XSv7IdAztKvQ31ECWUiOJrtbV5OaUm bUS8qWaB1b9BqqViDAltUjDbMavVWxVe8qf1PsLD3YnVidSnDpR9aiWjjTuhwQrWQL7K2o Jk5NL3v2df5HFdiZVqUr69k9dEyoOxt9XKGMldfC63trsQHR3C2wanpS9dlr80ylwbPrcr LgZNlzGGCKBHmLXrBGjnWor3lfIAo9EqmhOQ/z2AC+Jj41xVPf/V5B/68d86IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666572245; a=rsa-sha256; cv=none; b=oUoTcW6Cm/T047nDPg5+Jzlw3gJFZufkZ8baLcrwLfLNtntagJRiGnQ2MMeXq0HcBrDesI U/JTRy11ygGKc2jdy11xyE3CmeVLDRwzgGYw7tiiBhocHDNSJiDtEFuNOqYVjW6P3J4/qp PR/9kW65UOXuY2KC6GT0ecPWwlkavIFLg59MgAh/LQzc8xCZlU1hqKkGy4tii82l+KIsbj Wa3NzQlIlfnFY5qBQphMlN5yDcNwx+5AQLLR8s+PNw8tW/5cRWGVKnDKTzx6YG+f0JPPkU 9aqWxGIHdGKjGa/n5Zj042VOnx/u514V5yOrKCqbfkDTh8NaTiNnIoqj588iKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=c1d077b80609953601922348be950368e01f2c8a commit c1d077b80609953601922348be950368e01f2c8a Author: Doug Moore AuthorDate: 2022-10-03 05:15:21 +0000 Commit: Doug Moore CommitDate: 2022-10-24 00:43:46 +0000 Fix LINT build after 368ee2f86a0f4f6 Reported by: jenkins Fixes: 368ee2f86a0f4f6 (cherry picked from commit ffbc2a58b13a9239269e661fe23f86c587cc7638) --- 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 7aa00bd53fd7..0fb3cf94eebc 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); \