Date: Thu, 26 May 2022 18:03:17 GMT From: John Baldwin <jhb@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f818485a2cee - main - misc/dahdi-kmod26: Remove unused DRIVER_MODULE devclass on recent main. Message-ID: <202205261803.24QI3HCT089628@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <jhb@FreeBSD.org> AuthorDate: 2022-05-26 18:03:09 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-26 18:03:09 +0000 misc/dahdi-kmod26: Remove unused DRIVER_MODULE devclass on recent main. Reviewed by: David Gilbert <dgilbert@eicat.ca> (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 = { \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205261803.24QI3HCT089628>