From nobody Wed May 28 10:43:47 2025 X-Original-To: dev-commits-src-main@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 4b6mM72JBLz5xHxw; Wed, 28 May 2025 10:43: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6mM71rpPz3k80; Wed, 28 May 2025 10:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748429027; 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=0ojq5s4NzDbiGMa8lRI50Xr20G5jgUmNFt2Rf7AsDP0=; b=LyQGUBsoqjskFVa5A96PT8ibsczsNBMn/sjaT0rvE6aO+kCar3IJVYyRYDXc6OJWWY/5rC qJXzTdAortmHrwoo/LUNPry5saplWPUo0il0+RxoSwu92u7KteLC2kxADzoiqoB2kRJuFy TL5+6iq6VMRn/IlbGMQpmYoJ8ovFrgXC7iC4kdQ3QguMRJHfY2UW8c85hZVSnIXy9YLYN1 wQfu7ISBZcctmNX+ATttB0PRGXEETcieENPB9IVnzCR4Ra+UkGvvM5RvETHTSNKBcCjB2I I1oENERkRuXUrYbZ0MN3Yw1j2EslNf1+isk/v7XVH3RSnncmfYYIZhMGRxP2Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748429027; a=rsa-sha256; cv=none; b=gwXWm7r1gq/Dqnz6xRaV+bMbiSrMlFQpjYhaKmz5G3JII34GRGE3I0UnSPThc0jRCTedK2 sshnPCYzS5cZtx98L6zQMxaQcqCCRsCmZyPXmyFoV52/jUo4xcOpkWt/ahzGID/ADFmaRf oQjkxKx4O6RieDBY9CERzYoSh7fnAzuAaZ5u2SRMgBRKoBgqaAX+Dq/iES9/rIZMpRJo2e 6hxuHLnfoblWyF4x/HdIrwTnynvN2b+OEM+Gwq25KlYXb6n1tGhj3w+jLve7LyLHMMxqE1 HxVxFeh+inf1lTR0qQt1ZJmMJxXhMfKzYVal1CGbE8FR5Ngcaehm6dHSziLy1A== 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=1748429027; 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=0ojq5s4NzDbiGMa8lRI50Xr20G5jgUmNFt2Rf7AsDP0=; b=yQsrnDG3H9XB2oVfY3zxXscrrnIRmpH44gWeG3nBebCqcMtF7UCqzXZxXXNOL7LGedipFF jQDacCqx4G+q20KnZjRg4829+PtIsAXxh+FIxEMeNeGrVexULxsbFfQdKLOxtejvAsNR2W GiLZEk+2ZASz8px35K/HgiRd9pumgkrX25ccXznojVdfnRaOBo6JTul4J1Kgm2KvLrWqrI wkIOjaeTDghLYY079jQb/f7GCLY8gNwOqs2WXVAgKfUyhuuWWJc2jsY9Bh5JK0SqC9ljf9 XHiqM7PjlyxCweelsWVKn2glspzeQuCD0RSJ7mGcYajqmO0FA3TxWCHjUcOq7Q== 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 4b6mM71MmqzbNw; Wed, 28 May 2025 10:43:47 +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 54SAhlG7098736; Wed, 28 May 2025 10:43:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SAhldt098734; Wed, 28 May 2025 10:43:47 GMT (envelope-from git) Date: Wed, 28 May 2025 10:43:47 GMT Message-Id: <202505281043.54SAhldt098734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 54d0e1772fb6 - main - LinuxKPI: add struct_group_tagged() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 54d0e1772fb6b83d72725764e0a5d3ead8337673 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=54d0e1772fb6b83d72725764e0a5d3ead8337673 commit 54d0e1772fb6b83d72725764e0a5d3ead8337673 Author: Bjoern A. Zeeb AuthorDate: 2025-05-02 20:10:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-28 10:42:58 +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 MFC after: 3 days Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D50157 --- 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_ */