From nobody Thu May 26 18:03:17 2022 X-Original-To: dev-commits-ports-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 1A9DA1B4EBD6; Thu, 26 May 2022 18:03:18 +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 4L8G516LZHz4my5; Thu, 26 May 2022 18:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653588197; 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=I3wfCdjghHNCrybOiORWpkkqPcplFAyrWdxAM+t4TzQ=; b=YupiFbXUciQ+e5fTDPqPG9STeuG7ib/y/lqR8ThzcLWmUnjJ740tGopqNKxFIoary6KqNk YkAPXvSQ0k2PenUcF7pP21SmzZq8jSCLKUR5SoU8qLdk3ZgsFXugumUE8gXt5ahOuKzYPw iunV+TifsivQn04pkhYvPzuARV8lvac7zRp/RmAU0yuvi35zB9rpEt7ckxBx0WYrpTzgPa ba9m5ZSW/1POG+Qps1e0VZ3dewf//x/7m+SsZrdoBA/uQZhEK8F8QEleQqSRgCIyE7Ne5L tbxOIGIBx6KLfWjt9JhP5OmibJyL8uo65/0wcxJPoJdr2D9wR+1KvVASQGycYA== 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 A81D312B48; Thu, 26 May 2022 18:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24QI3HcW089629; Thu, 26 May 2022 18:03:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24QI3HCT089628; Thu, 26 May 2022 18:03:17 GMT (envelope-from git) Date: Thu, 26 May 2022 18:03:17 GMT Message-Id: <202205261803.24QI3HCT089628@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: f818485a2cee - main - misc/dahdi-kmod26: Remove unused DRIVER_MODULE devclass on recent main. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f818485a2cee96e3c1c4ddf64c43f6a6dc36f20b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653588197; 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=I3wfCdjghHNCrybOiORWpkkqPcplFAyrWdxAM+t4TzQ=; b=EjwWSbMD2voez1olSj+9IHB6bVphqSI5Iu1NGCe7JFYyBfTB2nejK7cd8jpNS+dqykppMR ArV5y+riv3m+uTbE/0DhdCATnFMrOAJnuLciqSa2YViuQNu50CQ4Z1aJwvoRDzXvQmNQo1 mMijM/iRZuhAh0vcJj5GZGIEkApRWwESDtIP22nbXIFOuc4N80mpiw3rQrSwK03vQb+T9R 5j0X22avS5Y4k1dKREtsedsgMlHwcLLHj85C93c83Jj0tzqTsKAnWIk002TAjhdz5fh7Fj t9B0KIf7X4ZXTYznerg/lX4fQHcEy8lCGfy1Ns9zdCIzP4L3VuEWURgBcgN+cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653588197; a=rsa-sha256; cv=none; b=bfK8IlfhUhOVPjKKUOYyHt6QmSKYS/CiufrwE55NSnDt1T6S0xQ2HnwL0ISMsW0BWXWmlC HV6y6lTkeSkKhG9occnpxgeseEAjN/a4rawr8bH3h7b6eS/+0Ie1jw8VrKagC7PaHYvQ24 pHvRN0Qpo6S5yPZDQ3bflq1Vd2SP0M2/JhxqKL6ngIlrG6CgGQshYbkv+DiT1dLauua5Uz nsumvNDSjSWRhEXy+pMpaFueXX6loduKfdHjlceARrGUas8xY93BmuJJOMxYleA3kNodaB gP1rhjfUeYt5OSZl5egfVpj40ELy+KefBm3I4mEIP6RHDPPyB5jHMPv6KLTIQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=f818485a2cee96e3c1c4ddf64c43f6a6dc36f20b commit f818485a2cee96e3c1c4ddf64c43f6a6dc36f20b Author: John Baldwin AuthorDate: 2022-05-26 18:03:09 +0000 Commit: John Baldwin CommitDate: 2022-05-26 18:03:09 +0000 misc/dahdi-kmod26: Remove unused DRIVER_MODULE devclass on recent main. Reviewed by: David Gilbert (maintainer) Differential Revision: https://reviews.freebsd.org/D35264 --- .../dahdi-kmod26/files/patch-include-linux-module.h | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/misc/dahdi-kmod26/files/patch-include-linux-module.h b/misc/dahdi-kmod26/files/patch-include-linux-module.h index a14dda094eba..6cad1f3c3b42 100644 --- a/misc/dahdi-kmod26/files/patch-include-linux-module.h +++ b/misc/dahdi-kmod26/files/patch-include-linux-module.h @@ -1,6 +1,21 @@ ---- include/linux/module.h.orig 2015-03-22 00:59:45.757428000 +0600 -+++ include/linux/module.h 2015-03-22 01:00:08.597762000 +0600 -@@ -47,7 +47,7 @@ +--- include/linux/module.h.orig 2012-03-26 17:40:58 UTC ++++ include/linux/module.h +@@ -38,16 +38,22 @@ int _linux_module_modevent(struct module *mod, int typ + _LINUX_MODULE(name); \ + DEV_MODULE(name, _linux_module_modevent, THIS_MODULE) + ++#if __FreeBSD_version >= 1400058 + #define LINUX_DRIVER_MODULE(name, busname, driver, devclass) \ + _LINUX_MODULE(name); \ ++ DRIVER_MODULE(name, busname, driver, _linux_module_modevent, THIS_MODULE); ++#else ++#define LINUX_DRIVER_MODULE(name, busname, driver, devclass) \ ++ _LINUX_MODULE(name); \ + DRIVER_MODULE(name, busname, driver, devclass, _linux_module_modevent, THIS_MODULE); ++#endif + + void _linux_module_ptr_sysinit(void *arg); + #define _module_ptr_args __CONCAT(_module_ptr_args_, __LINE__) #define _module_ptr_init(field, val) \ static struct module_ptr_args _module_ptr_args = { \