From nobody Mon Jan 26 09:33:20 2026 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 4f03Hp1gltz6Q122 for ; Mon, 26 Jan 2026 09:33:26 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f03Hp0y0Zz3JRt for ; Mon, 26 Jan 2026 09:33:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769420006; 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=cYjFfvlKF3cPdltV/2+Exf6AqPFlRhYE7erb1PhI9fA=; b=RuaDpCjePrtHvEVn91nq61sYceo04HEyxD1nU6wf+nunEue9mCrWzuiEP5vdVECtZ0t5RN MiKfMhvoBdVPXdFb+f13pJ+HnbhnMyve+9vnJHcoO22gCPP0QBT8MLvAdpvbFIdfE6bsGA ad019qzuLUfaL6fR/JNiHZekT1hUztrgniZtt/Uq7psG0M2963jlK1xltKyGfk7Ymdgzuj 7GLtKQzOJZOs1uqPy7wuYx7HmzRyIZFybhtoxR3winpXUq3W6+vjJnCiBqbZJVUiRAjwLh JGMMrIZuyVL2hCn4CKoafqxq/xrNJwq1ez3B49KJ+npDoSxumzaluawOWb8AFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769420006; 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=cYjFfvlKF3cPdltV/2+Exf6AqPFlRhYE7erb1PhI9fA=; b=leZq66ohZj3JwmxC0A9rtNJb6jO1zKAc8n9MwwDB7sMiocJVds97f6HoOgMOPf2/ejCdPS z8dKtlzkO2pjYHaRrIEXsiL65hhPFNHHEPgv31Xr29t+QgDySgxKgstHTOAEneHc9kFhZj Lv2nQGst1Al7AFecrFJkTS+mZLSPeSxKoo456MGrWKS4dAAALiz0jiUB41Hja+M2TeVTW3 m3dgtb19lt0KCUIN9uFsV3lhec0vJFNrWLY1Ox0dGbz04ULFshBqK+nhi/KdxwWb9eamI3 g2Wbr9EpTdajLX7mxrbZyD05CQ7uZq9vOVYJm0Ny7iGrLF/k8+/o33ZVcqITXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769420006; a=rsa-sha256; cv=none; b=BpmNk1I2FX7XSkZ8lpZ4PHU5e9jWCazTWBeFBfa5Eb2wNGzTEpf0gZmJZL7g/WsPjcgJnY SgQoZkRFhMH8m7QeLRiuyqnIppUHAX8md9b/3hpA9d8156v7m2olLtcxnSzzc6OVJ41RaC vnphLPuTjaMZTRiNWTZLS9Q94pm58JkVr73wYV/Lhu2slEAo+BPeY+7LnXu95q0A07v8Jo Jd4Hiny7Mz9AeTLe6gQQyJWmllziosKdJaDb6LcXvxjY+PEOXlQpo3tPg3pdZ8Gz11IfT2 F9Tb7VLgVquaflv+f6rfNmWvrM37BF5r8wsqeLyjgJ7/ABtZ42U9cxHclvvMcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f03Hn6zLzzCh for ; Mon, 26 Jan 2026 09:33:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3523b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Jan 2026 09:33:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 6ecaa8dfb64b - main - sys/module.h: allow MODULE_DEPEND to accept macros 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: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ecaa8dfb64b796085afdf597ec3a79878bde12f Auto-Submitted: auto-generated Date: Mon, 26 Jan 2026 09:33:20 +0000 Message-Id: <697734e0.3523b.477579cd@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=6ecaa8dfb64b796085afdf597ec3a79878bde12f commit 6ecaa8dfb64b796085afdf597ec3a79878bde12f Author: Ahmad Khalifa AuthorDate: 2026-01-26 09:27:59 +0000 Commit: Ahmad Khalifa CommitDate: 2026-01-26 09:32:10 +0000 sys/module.h: allow MODULE_DEPEND to accept macros Allow MODULE_DEPEND to accept macros by adding an extra level of indirection. Some drivers in the tree actually depend on this being the case. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54874 --- sys/sys/module.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/sys/module.h b/sys/sys/module.h index f749455bdf63..b4a08e2fc26f 100644 --- a/sys/sys/module.h +++ b/sys/sys/module.h @@ -116,15 +116,17 @@ struct mod_pnp_match_info }; \ DATA_SET(modmetadata_set, MODULE_METADATA_CONCAT(uniquifier)) +#define MODULE_DEPEND_CONCAT(module, mdepend) _##module##_depend_on_##mdepend #define MODULE_DEPEND(module, mdepend, vmin, vpref, vmax) \ - static struct mod_depend _##module##_depend_on_##mdepend \ + static struct mod_depend MODULE_DEPEND_CONCAT(module, mdepend) \ __section(".data") = { \ vmin, \ vpref, \ vmax \ }; \ - MODULE_METADATA(_md_##module##_on_##mdepend, MDT_DEPEND, \ - &_##module##_depend_on_##mdepend, #mdepend) + MODULE_METADATA(MODULE_DEPEND_CONCAT(module, mdepend), \ + MDT_DEPEND, &MODULE_DEPEND_CONCAT(module, mdepend), \ + __XSTRING(mdepend)) /* * Every kernel has a 'kernel' module with the version set to