From nobody Sat Jun 20 11:53:54 2026 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 4gjCXy3qGyz6jQ3Z for ; Sat, 20 Jun 2026 11:53:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gjCXy2fnNz3bgj for ; Sat, 20 Jun 2026 11:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781956434; 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=SkIw6sJa//R1/CYfFj7gdx96gKjifRTwAJuUKqVD2pk=; b=QxX808yySQL1R4/qGniHEHXh+xuNhPdrXm0pYyCyvlT6KG7FlR7xz2YRbimsmw/wyKPU3d ezLmMMCVQjWYd+T2lHAFGm8uoY7TvjcNNXYBrhofuSgd2mjXM6JaTkkk9xKfpqIV4ySPvN ANFNE1eIR88eZAno+23Dh0pUcSwJLZ0RkVNEt7rKyIonUqTdqSZwNSi+nxqvTpQDA0CZj4 AvjdyL4bWKW+fIcdevqD5dMILc0zCHHPP40gmdukDdqf5AjRELjGKvTma7QbA+w01MRukQ 78SNcp9QUpzW48tHSfnyARSaHTNBZfdPMJCs1us8PX2M820AzIxGYo0Hj5x/PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781956434; a=rsa-sha256; cv=none; b=cqZHVON+JxUvSK+pPb0A29UBnhJ50u4AEEKH/r3XmOz6gAHuFxI6XuPUGTHPCsSvXK4ag7 m8y37qZJidEbT/E+86gmp3PUDvgXSTUEVrUYpS3dbuC/DmYyQfchRWrrkfKHEUG2QCtxMa qZi13dTnTPxNnltZC9KikTIlIMPHLDoT1cGy+6M4hznrj7mO/W8mcdgs97XR07oaob9PUA LJ+QSYgJmHsOHvMZ9rhWyXpr2U5pXj9TMtKEyf0rVYdg2IylLPycMe+xr0uprKkczF3SAQ xg7fLsb3bFPGUiFklfnLinXlAEiMVGgkADYuT1JV+5panO0qYewdjZW/Sa0wxw== 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=1781956434; 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=SkIw6sJa//R1/CYfFj7gdx96gKjifRTwAJuUKqVD2pk=; b=WPtybN5nkEJy31Z8dtTmd+MnstY/Ax+I3/uc7hbP3dcDsQkFSZli/5oE7+zlvRsQyBO5q9 0jVEcHwRq+jV1Fb7i0qKmyKiFsqXIX4IFQC7kmjKeq0w86o5xboDbwobTFmKYN2Xx14XhG fr70dEKOzSJMmTYw3G0B8pejOVsXhgg/1BenNGZPicJAcuiLk94jLLK9OQPRrfW/iABhGN MqpbtwDm1aROdn5tBupnM1NDSMmFEJJV4vgNu9MaiTFzfIJ08fr2uSPj86UF28226J5eb6 sXAV6cu3BDNrXcls5VzhojfqBNvuira+HBC8YwD8zzcLzDCMiC7B7YqvCgNvZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gjCXy1P0mzDPV for ; Sat, 20 Jun 2026 11:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26292 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 20 Jun 2026 11:53:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: 294553b022b1 - main - linuxkpi: Define `__ATTR_RO_MODE()` and `__ATTR_RW_MODE()` 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: 294553b022b1e775111365094a70041934d98501 Auto-Submitted: auto-generated Date: Sat, 20 Jun 2026 11:53:54 +0000 Message-Id: <6a367f52.26292.318c88f8@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=294553b022b1e775111365094a70041934d98501 commit 294553b022b1e775111365094a70041934d98501 Author: Jean-Sébastien Pédron AuthorDate: 2026-06-12 10:44:36 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-06-20 10:34:45 +0000 linuxkpi: Define `__ATTR_RO_MODE()` and `__ATTR_RW_MODE()` They are the same as their `__ATTR_RO()` and `_ATTR_RW()` equivalents but they take the file mode as an extra argument. We now use these new macros to redefine `__ATTR_RO()` and `__ATTR_RW()` on top of them. The amdgpu DRM driver started to use `__ATTR_RW_MODE()` in Linux 6.13. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57574 --- sys/compat/linuxkpi/common/include/linux/sysfs.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/sysfs.h b/sys/compat/linuxkpi/common/include/linux/sysfs.h index 7c8c4e2e32b9..4aea46d6b120 100644 --- a/sys/compat/linuxkpi/common/include/linux/sysfs.h +++ b/sys/compat/linuxkpi/common/include/linux/sysfs.h @@ -64,12 +64,15 @@ struct attribute_group { .attr = { .name = __stringify(_name), .mode = _mode }, \ .show = _show, .store = _store, \ } -#define __ATTR_RO(_name) { \ - .attr = { .name = __stringify(_name), .mode = 0444 }, \ +#define __ATTR_RO_MODE(_name, _mode) { \ + .attr = { .name = __stringify(_name), .mode = _mode }, \ .show = _name##_show, \ } +#define __ATTR_RO(_name) __ATTR_RO_MODE(_name, 0444) #define __ATTR_WO(_name) __ATTR(_name, 0200, NULL, _name##_store) -#define __ATTR_RW(_name) __ATTR(_name, 0644, _name##_show, _name##_store) +#define __ATTR_RW_MODE(_name, _mode) \ + __ATTR(_name, _mode, _name##_show, _name##_store) +#define __ATTR_RW(_name) __ATTR_RW_MODE(_name, 0644) #define __ATTR_NULL { .attr = { .name = NULL } } #define ATTRIBUTE_GROUPS(_name) \