From nobody Wed Jun 4 22:23:55 2025 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 4bCMYm0kzYz5xkF8; Wed, 04 Jun 2025 22:23:56 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bCMYl1zcTz44FS; Wed, 04 Jun 2025 22:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749075835; 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=6nc/eyYXUmOVFlp5D22muqosUfjpNd6Iytw6HqYTjsg=; b=wazpSF7/yffpMCpcszag3aHNlV6vQbJmrMmf5fA7G27HDN2/pp8eg2JvV0wXj9pByUF6NS ghFJNHJXGlNuHgYs/jLNS1bVBZU0b/oz5alhuXLYC4yb4rzPPyAfqhSJNFkUyg1I72degf 778nBSffHslZ3aY7H1H5Qr6FUqo4AnWgbs0NYLWQw/+vDZPmkmcMo6iUBe/wULVeskcgko 8YP5dS1JfpGn5VV4cjRyheuT9UluG5fdUANEh0zTyFTC/lPFzDZeyUyjjmRDYfy74Jwk5K fHXc35yD5R89OlCVsRHlTf1DXmhTyu+1n01aLeflWS9F01crR8cV+hs1a1m+YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749075835; 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=6nc/eyYXUmOVFlp5D22muqosUfjpNd6Iytw6HqYTjsg=; b=laUKoxOfh941k85LJL4JBfuyym0dAdsLTvxxQ7kDDuM/IuNMo9B2KpE3GDL8IrAP54QyQK scKRuHxRaUHnPt4e4GnB3CXOkct9CpRmY4NhSycHO3Ox1tLnOnX6eGFF7XXsM6+L99paMm uhm+GH3ipNxjHj6YJgbeEMLO2puin7ezEhsIZfPJT8unhL1a5njMlnXcBiHIeauz4ucQz6 3AWyFpSTQA7YFKMVLQNckrHVk1jZbFOcq7Frppc8gbMaTkf6fA1zuJ3lfxEYm1gXxyCL0K MnSn9YTS1kHDGDbgYGN1gbFttBfiBs8/OT2VRYemIKCPUm97eNUu9zxc8YzbGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749075835; a=rsa-sha256; cv=none; b=vEfHYomFUxJ0o5ax2SBu5z/QIfNnyrMHXJ0kPQXwmPJ1psOX6+uS/IIvW0oupKJYyjtbEr U7nJlO+sSDXR+lP/vK+6nKxDwaj09g9SsKC5mPLQ6jdeWLZIt8XMsO/J8jUJxOKGR3kMoo /RynJJDUMrhLtoei9d7KkuDQmOZUBRisU0+xMiiBqCeKdY9T0F7dOBgyljK8MhONd03miU 4vnSwM/om1YE3LSX6vQc6+xibVNoNcZZ6ihkY9mJgD2mKb0Nwoo26C1QuFPl5ZylA2Mk4l IRBvdkKTVSN6fMVuo4G3tBDhcMsbXZwAsssC0LfOIjm65bOghcYBwrzz/wYzyA== 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 4bCMYl1WwJzjtH; Wed, 04 Jun 2025 22:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 554MNtgC037785; Wed, 4 Jun 2025 22:23:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 554MNtxd037782; Wed, 4 Jun 2025 22:23:55 GMT (envelope-from git) Date: Wed, 4 Jun 2025 22:23:55 GMT Message-Id: <202506042223.554MNtxd037782@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6573b7db7143 - stable/14 - LinuxKPI: add struct_group_tagged() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6573b7db71438f852fb80f10b3f5539f596f23f8 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6573b7db71438f852fb80f10b3f5539f596f23f8 commit 6573b7db71438f852fb80f10b3f5539f596f23f8 Author: Bjoern A. Zeeb AuthorDate: 2025-05-02 20:10:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-04 22:23:31 +0000 LinuxKPI: add struct_group_tagged() Restructure struct_group() into a wrapper around __struct_group(). Various callers have arguments annotated as /* no foo */ so try to add all we can find. Sponsored by: The FreeBSD Foundation Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D50157 (cherry picked from commit 54d0e1772fb6b83d72725764e0a5d3ead8337673) --- sys/compat/linuxkpi/common/include/linux/stddef.h | 26 ++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/stddef.h b/sys/compat/linuxkpi/common/include/linux/stddef.h index a3bc6b13765e..d04a5a4bf516 100644 --- a/sys/compat/linuxkpi/common/include/linux/stddef.h +++ b/sys/compat/linuxkpi/common/include/linux/stddef.h @@ -5,11 +5,27 @@ #include -#define struct_group(NAME, ...) \ +/* + * FreeBSD has multiple (vendor) drivers containing copies of this + * and including LinuxKPI headers. Put the #defines behind guards. + */ + +#ifndef __struct_group +#define __struct_group(_tag, _name, _attrs, _members...) \ union { \ - struct { __VA_ARGS__ }; \ - struct { __VA_ARGS__ } NAME; \ - } + struct { _members } _attrs; \ + struct _tag { _members } _attrs _name; \ + } _attrs +#endif -#endif /* _LINUXKPI_LINUX_STDDEF_H_ */ +#ifndef struct_group +#define struct_group(_name, _members...) \ + __struct_group(/* no tag */, _name, /* no attrs */, _members) +#endif +#ifndef struct_group_tagged +#define struct_group_tagged(_tag, _name, _members...) \ + __struct_group(_tag, _name, /* no attrs */, _members) +#endif + +#endif /* _LINUXKPI_LINUX_STDDEF_H_ */