From nobody Mon Dec 19 22:07:47 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 4NbYjb2vktz1HBBH; Mon, 19 Dec 2022 22:07:47 +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 4NbYjb2TbHz3Fmj; Mon, 19 Dec 2022 22:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671487667; 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=vOZgrsz5do/9JC94BA8H5wB2VoojfhxzzV2nCy+RJco=; b=QbVZeMLH7nkHYttI7fh52tQBPDlsKs9bEJhmvkXNpm8IMCD5+mnkNyc02hBix58S+cHBCt vVSTtzJ0mquy5H+gzKdPbNdaZJxJlYJZpsGRzUVh4cAHQj2c2uqrMv3Yve/JSPMN3mRt2b lx9JlQLxw5RyWBtkwobV80+oOEj40bWhXUEZ2kjRIzcU6UjKoD9H6+XY3Lk8O8kSHiWNkI i7uV3WVnp5wsOhrhSj6cK4u2V5xO8lNcIgEdUURtghgwIhcrRCOxgNDc1dGOC7Jxf97pxk 1TA9rF52ESwLPorJbc+disvXUfpLdydC6O9Pm0fH6MT1g9/skQ9y1jv/BGbNEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671487667; 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=vOZgrsz5do/9JC94BA8H5wB2VoojfhxzzV2nCy+RJco=; b=eroZT+zgk4B4KhQ3pm8vYIeyUfV49SmMCoR/GHKL+2Jb+BszPmoyf0klraNDJgrGJUtAnM rGA+Nj05kW9WMPZDpvb95+hexdaV5wmb+nN/Guxs+2JZeNGOwpy1J1yQ0XiQID7iJKPxmy x1NFymyor0xwW5qC/2uGrpkBpG5pfQttrOtNqG9+6KjWLK+I2RwKTWFporoq30q39h8uf6 yAynhFU0ore7Ux6c1s/Uos77BfprM8xishl5eiYvoj4WLzu3PV3gIh8ExQZ8vgeQUqlZ8c iw0dM+rsMgOSNDSM1ILxVGy67kikUH4BHIocLovGQWIZOld290n8ZzL6755kaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671487667; a=rsa-sha256; cv=none; b=hWS5phhssBNb6Jf91cS9iU6PLpUN42NfNBek+rxm1QBU9F6uBSne4HxSybcP8932gJlwuV kAZIh0g1LaPbJBA7WbSmKvsxjhXoANvVOWkBPcuYLZ0F4J4hGPI6iKRo/QDJB8ANfdCRl8 JsbBdfwgtydMppZ5O2tvFDfqvay8Y8UET6V1PFnCKb3PqQpzlclZ14MujwNMzQI1aGCQSU S1kX6GC5RgSlnZEoCrN4UMBtQoA90LdP09Y5xp9Aq1AqJOQcs+9BdlW0/N/tdnC9F/GJ4q UOuez0E7kkfeMW3WViOP/JXPffQZQQKIFoNgyCyCtIyYUvUIJ34ZufrPHT3f+g== 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 4NbYjb1PzRz1B7m; Mon, 19 Dec 2022 22:07:47 +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 2BJM7lgq043955; Mon, 19 Dec 2022 22:07:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BJM7lRl043954; Mon, 19 Dec 2022 22:07:47 GMT (envelope-from git) Date: Mon, 19 Dec 2022 22:07:47 GMT Message-Id: <202212192207.2BJM7lRl043954@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: 9d4303dbe2c4 - stable/13 - rb_tree: fix stable/13 linux/rbtree.h post ABI fix 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: 9d4303dbe2c4a901418657ed09c9f7096756e8b3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=9d4303dbe2c4a901418657ed09c9f7096756e8b3 commit 9d4303dbe2c4a901418657ed09c9f7096756e8b3 Author: Doug Moore AuthorDate: 2022-12-19 22:03:13 +0000 Commit: Doug Moore CommitDate: 2022-12-19 22:03:13 +0000 rb_tree: fix stable/13 linux/rbtree.h post ABI fix Rearranging the left, right, and parent pointers for backward compatibility with stable/13 in d8a88ec381498f5942403088d28ee325b92e9a78 is incomplete because it does not change linux/rbtree.h so that it too knows how rb_left and rb_right are redefined. So complete it. Reported by: jon_xyinn.org, jgibbons@protogate.org Tested by: manu, jon_xyinn.org Differential Revision: https://reviews.freebsd.org/D37743 --- sys/compat/linuxkpi/common/include/linux/rbtree.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/rbtree.h b/sys/compat/linuxkpi/common/include/linux/rbtree.h index de21f0e4c613..bd2589392bf1 100644 --- a/sys/compat/linuxkpi/common/include/linux/rbtree.h +++ b/sys/compat/linuxkpi/common/include/linux/rbtree.h @@ -41,8 +41,8 @@ struct rb_node { RB_ENTRY(rb_node) __entry; }; -#define rb_left __entry.rbe_link[_RB_L] -#define rb_right __entry.rbe_link[_RB_R] +#define rb_left __entry.rbe_link[_RB_L-1] +#define rb_right __entry.rbe_link[_RB_R-1] /* * We provide a false structure that has the same bit pattern as tree.h