linux: module: weld all but spl.ko into zfs.ko

Originally it was thought it would be useful to split up the kmods
by functionality.  This would allow external consumers to only load
what was needed.  However, in practice we've never had a case where
this functionality would be needed, and conversely managing multiple
kmods can be awkward.  Therefore, this change merges all but the
spl.ko kmod in to a single zfs.ko kmod.

Reviewed-by: Tony Hutter <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #13274

2 files changed, 0 insertions, 32 deletions

diff --git a/module/avl/Makefile.in b/module/avl/Makefile.in
deleted file mode 100644
index 991d5f95b..000000000
--- a/module/avl/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-ifneq ($(KBUILD_EXTMOD),)
-src = @abs_srcdir@
-obj = @abs_builddir@
-endif
-
-MODULE := zavl
-
-obj-$(CONFIG_ZFS) := $(MODULE).o
-
-$(MODULE)-objs += avl.o
diff --git a/module/avl/avl.c b/module/avl/avl.c
index 3891a2d62..69cb8bf68 100644
--- a/module/avl/avl.c
+++ b/module/avl/avl.c
@@ -1044,28 +1044,6 @@ done:
 	return (AVL_NODE2DATA(node, off));
 }
 
-#if defined(_KERNEL)
-
-static int __init
-avl_init(void)
-{
-	return (0);
-}
-
-static void __exit
-avl_fini(void)
-{
-}
-
-module_init(avl_init);
-module_exit(avl_fini);
-#endif
-
-ZFS_MODULE_DESCRIPTION("Generic AVL tree implementation");
-ZFS_MODULE_AUTHOR(ZFS_META_AUTHOR);
-ZFS_MODULE_LICENSE(ZFS_META_LICENSE);
-ZFS_MODULE_VERSION(ZFS_META_VERSION "-" ZFS_META_RELEASE);
-
 EXPORT_SYMBOL(avl_create);
 EXPORT_SYMBOL(avl_find);
 EXPORT_SYMBOL(avl_insert);