:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g5W4q40RNz6c0gx for ; Wed, 29 Apr 2026 21:43:07 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g5W4p6ZWNz3h05 for ; Wed, 29 Apr 2026 21:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777498987; 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=tENd9nYv5sse1utahFzvF70P3Uvrl++0PrdLQtW0/c0=; b=EqFnvJXwcqnCjkhJb6Jnxg/xTl330mIIim/+eSmpOpRk4v4COpliPaNRVrTSncG+hghvHX fUJhvFMQHDbpXSLOH0B4XbfceWT1uS/BucE4uoxF00RH5FH6HASIuU9O2iuuFL0oT7ck02 cV6Q05Ek8jwcrKVnGhwJinN8ndS2SceF0JCmP3DAm7+ms/fOHgDRiHXi5VHuq54RZoNr8y yjZoNN6rpZ6es6JQBEK+ioN8Oiy4dcIMEwRzhzav9kkQJSiFiRtjw3CnPcwtpeOokRfj1w m135z7xvj0YbEk2nHPr8MqiQzFhrl3FqzgfRjgCBADMk84SvtMVaBjA4sZ0gIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777498987; a=rsa-sha256; cv=none; b=aPFzPA8mdUnB3wWqoSqfCa76z0h2gk1rHiHE8CsN4NLjQXd4pJs1tiGHkrU7BdbI5b1KXv anfZSj3uvtJP3apDRh2v/B+rYropOaY17cpC58PoZxl56tEHTHGGYzHsUJziC0KqZhdTCw s95KW+slVNfzF5GBfBHHm5sNMihgkj93zsCcqkWAGN45h0X9v48xWVscS/IbEGTiNjA1ee hVeaB6Qof1jskEW7Exhncx8sxQ3mLxLBeMY5WIZiYkdy8KDMietI6ZPE/4JqooXZBiE1j0 lGcIIArK1VY0eqlhKkm4YZGVRdZIlopUYmxO2p2hL/3JObjjqet2DfRzVUWJPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777498987; 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=tENd9nYv5sse1utahFzvF70P3Uvrl++0PrdLQtW0/c0=; b=qXKJ+iiRnVCaKfelyXYb1gqSazk/yLoKuMkhKX+JYt6fpmGbEz4fWA9XDNQ3II45jvCZ16 tThyJApnt4clYH3LuRwGSQTHQ4lJahWzOyJoyrfJtjcIP2D6Y1cgkh9E22HM2dsaV+wzSr g9GVKALtdSbOtsj2h295M7x5KbhCPMWU+DKBrTtLdi190iB/dKeDj3Z2Di2F+j6Mqsbqi4 j1B6heF4lz9LhZtGB/eVCmnAneq/E2NocfJyMmfATGzKyE3xK/9gOr04RxxVJEZ95kavgg LkGw0jRSWFW6I3CANl068nZJBSe4aC5TEiTRoBqYMN+h+V9kA8uSn8JmOQTdog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5W4p676dzyGW for ; Wed, 29 Apr 2026 21:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18d0b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 21:43:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: b34aa6b52d88 - stable/15 - linuxkpi: Add `rb_add()` 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b34aa6b52d88f56605df8825e1be5b8c634f78dd Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 21:43:06 +0000 Message-Id: <69f27b6a.18d0b.442cf296@gitrepo.freebsd.org> The branch stable/15 has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=b34aa6b52d88f56605df8825e1be5b8c634f78dd commit b34aa6b52d88f56605df8825e1be5b8c634f78dd Author: Jean-Sébastien Pédron AuthorDate: 2026-04-21 00:38:56 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-04-29 21:04:07 +0000 linuxkpi: Add `rb_add()` It is the same as `rb_add_cached()` but it works on `struct rb_root`, not a `struc rb_root_cached`. It also does not return anything. The DRM generic code started to use this in Linux 6.12.x. Reviewed by: bz Sponsored by: The FreeBSD Foundation (cherry picked from commit cff716c2854c167ef7ff3a4785f5faed9b0a4f98) --- sys/compat/linuxkpi/common/include/linux/rbtree.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/rbtree.h b/sys/compat/linuxkpi/common/include/linux/rbtree.h index e6033cfd760d..834e5645e991 100644 --- a/sys/compat/linuxkpi/common/include/linux/rbtree.h +++ b/sys/compat/linuxkpi/common/include/linux/rbtree.h @@ -199,6 +199,26 @@ rb_add_cached(struct rb_node *node, struct rb_root_cached *tree, return (leftmost ? node : NULL); } +static inline void +rb_add(struct rb_node *node, struct rb_root *tree, + bool (*less)(struct rb_node *, const struct rb_node *)) +{ + struct rb_node **link = &tree->rb_node; + struct rb_node *parent = NULL; + + while (*link != NULL) { + parent = *link; + if (less(node, parent)) { + link = &RB_LEFT(parent, __entry); + } else { + link = &RB_RIGHT(parent, __entry); + } + } + + rb_link_node(node, parent, link); + rb_insert_color(node, tree); +} + #undef RB_ROOT #define RB_ROOT (struct rb_root) { NULL } #define RB_ROOT_CACHED (struct rb_root_cached) { RB_ROOT, NULL }