The branch stable/13 has been updated by dchagin:
URL:
https://cgit.FreeBSD.org/src/commit/?id=e06cbb2b7ac1f522af22cc5002c4ee3cf1d0eb3b
commit e06cbb2b7ac1f522af22cc5002c4ee3cf1d0eb3b
Author: Dmitry Chagin <dcha...@freebsd.org>
AuthorDate: 2021-05-26 05:34:32 +0000
Commit: Dmitry Chagin <dcha...@freebsd.org>
CommitDate: 2021-06-10 09:39:38 +0000
linux_common: retire extra module version.
The second 'linuxcommon' line was added by
c66f5b079d2a259c3a65b1efe0f2143cd030dc52
but Linuxulator's modules dependend on 'linux_common'.
To avoid such mistakes in the future rename moduledata name and module
name to 'linux_common' and retire 'linuxcommon' line.
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D30409
(cherry picked from commit 5184e2da41921dfec5a3668756890b5c073fbad9)
---
sys/compat/linux/linux_common.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/sys/compat/linux/linux_common.c b/sys/compat/linux/linux_common.c
index 5a0ac015ed0e..4d81470649de 100644
--- a/sys/compat/linux/linux_common.c
+++ b/sys/compat/linux/linux_common.c
@@ -43,8 +43,6 @@ __FBSDID("$FreeBSD$");
#include <compat/linux/linux_mib.h>
#include <compat/linux/linux_util.h>
-MODULE_VERSION(linux_common, 1);
-
SET_DECLARE(linux_device_handler_set, struct linux_device_handler);
TAILQ_HEAD(, linux_ioctl_handler_element) linux_ioctl_handlers =
@@ -83,10 +81,10 @@ linux_common_modevent(module_t mod, int type, void *data)
}
static moduledata_t linux_common_mod = {
- "linuxcommon",
+ "linux_common",
linux_common_modevent,
0
};
-DECLARE_MODULE(linuxcommon, linux_common_mod, SI_SUB_EXEC, SI_ORDER_ANY);
-MODULE_VERSION(linuxcommon, 1);
+DECLARE_MODULE(linux_common, linux_common_mod, SI_SUB_EXEC, SI_ORDER_ANY);
+MODULE_VERSION(linux_common, 1);
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
