From nobody Wed Dec 13 18:28:48 2023 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 4Sr3sD6JWtz547n7; Wed, 13 Dec 2023 18:28:48 +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 4Sr3sD5lzfz4KNb; Wed, 13 Dec 2023 18:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702492128; 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=iQBjgfs+tnpgJBL0E4cRIeSE//vjUqx4KMSwrut6p/M=; b=YBJ0zKRJkNwefP82zy9cEBJbs9KNnSH8xgz56kCcG0EHlzaNf1vItHt8jVvcR8gpaOg58e NFsNIcpA7lWjHfeGXSqwRRS9M4xZQJnmjs6J0g9fmQDhV+tWVADDqoMiNfsavFp7IwbtTH K3lxB+8kEW65fxJ5g745Yx8o/32Plbb7p2XMHz8xYFuW3ZnfVqtKRnTo0H3FZuQE8E7XXj F1gpzOyCN6pKm+5TCej5iy7nPH+1W8jqCKM2uJc8AA4+lGBkt493d2j1ZtCz+29P8dckz7 BeDPVbKcvBBXWpcitPxYyQ/nfATdprMVS4+Kdy1PcXfZuJLUJasKG6wpew3Vkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702492128; a=rsa-sha256; cv=none; b=AX85JFjxxqh09C0AXYxuuKVK+I/9U4JzUgdQt+ufmPa5Po6vniHz8ljiZH5kMH8gEBVaaR pmrJgzsjZyQ5FC6uPCze1wr6ZgPEyXtdDvkOjTgYorFIAzPESAvpyojuUS4J4ytR8wWuKy muQHkYb4tjndPdzr89WnAfUdlZAN618eGWScEriOBQrerlbiJpO5AKif5BH7NCBPLbWBqg Z8ETb2biLdTEDWb3lrQ4wgCpaV49V3gxusioOo2GtM8Yy06IMlDzGfBKtqk/qdTVEupYZa 7UKPURBkxA/gw6J5nVsd1UfCg3OV7wrcyNgd0NTuL0wfQ0vNVDt8RnAINp72cg== 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=1702492128; 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=iQBjgfs+tnpgJBL0E4cRIeSE//vjUqx4KMSwrut6p/M=; b=eeEfyosiQgG49xltLueur6Fls83AtoDdrWdxPUeHVGUwTIvy+rFP0gF/yufTx2zL/7MOd+ zZIo6EJeOdYH/Wb4SynXdSaz8FTiUD09SzqhSw7fwchKSqbcfp5u6RQXvjDCXvxrTC1qoP J26aVF9VWYJXd6wavx7knkSJ+mdT8jTl43PnpGHjAXTesQ37yfXfjy3Q2b2Phbvoct7Bff uppwmaN+swYk5Hz5POs5OUnttFuojxXdYWcFHZwFr/HyaGokycYnY5EwycTvuUCWT5MHEp VpNE4mprzUmNFlhkN77t5OQgbjrx4odekHzVqmDvI4g8hUZnIG5xynobwsml4g== 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 4Sr3sD4s1Gz189F; Wed, 13 Dec 2023 18:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BDISmh7019087; Wed, 13 Dec 2023 18:28:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDISmSp019083; Wed, 13 Dec 2023 18:28:48 GMT (envelope-from git) Date: Wed, 13 Dec 2023 18:28:48 GMT Message-Id: <202312131828.3BDISmSp019083@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= Subject: git: d752a5e82ac9 - main - linuxkpi: Fix `__ATTR_RO()` in 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d752a5e82ac92603fadf82e7de75878e1f5d054a Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=d752a5e82ac92603fadf82e7de75878e1f5d054a commit d752a5e82ac92603fadf82e7de75878e1f5d054a Author: Jean-Sébastien Pédron AuthorDate: 2023-12-08 21:57:24 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-12-13 18:18:46 +0000 linuxkpi: Fix `__ATTR_RO()` in [Why] The passed structure may not have a `.store` field. This is the case in the amdgpu DRM driver starting with Linux 5.18. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D43023 --- sys/compat/linuxkpi/common/include/linux/sysfs.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/sysfs.h b/sys/compat/linuxkpi/common/include/linux/sysfs.h index 8b4160453a3a..4a65095d9eb1 100644 --- a/sys/compat/linuxkpi/common/include/linux/sysfs.h +++ b/sys/compat/linuxkpi/common/include/linux/sysfs.h @@ -54,7 +54,10 @@ struct attribute_group { .attr = { .name = __stringify(_name), .mode = _mode }, \ .show = _show, .store = _store, \ } -#define __ATTR_RO(_name) __ATTR(_name, 0444, _name##_show, NULL) +#define __ATTR_RO(_name) { \ + .attr = { .name = __stringify(_name), .mode = 0444 }, \ + .show = _name##_show, \ +} #define __ATTR_WO(_name) __ATTR(_name, 0200, NULL, _name##_store) #define __ATTR_RW(_name) __ATTR(_name, 0644, _name##_show, _name##_store) #define __ATTR_NULL { .attr = { .name = NULL } }