aboutsummaryrefslogtreecommitdiffstats
path: root/module/unicode
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2015-02-18 15:39:05 -0800
committerBrian Behlendorf <[email protected]>2015-02-24 11:37:44 -0800
commitb4f3666a16a61aa2ac7dca0b199e7ce51edbcd60 (patch)
tree4ba07df5014ed7b83c71563b1d4e7b1138ee36cf /module/unicode
parent1efdc45ea805e61de2c54736cd1b2a4a5f48a913 (diff)
Retire spl_module_init()/spl_module_fini()
In the original implementation of the SPL wrappers were provided for module initialization and cleanup. This was done to abstract away any compatibility code which might be needed for the SPL. As it turned out the only significant compatibility issue was that the default pwd during module load differed under Illumos and Linux. Since this is such as minor thing and the wrappers complicate the code they are being retired. Signed-off-by: Brian Behlendorf <[email protected]> Closes #2985
Diffstat (limited to 'module/unicode')
-rw-r--r--module/unicode/u8_textprep.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/module/unicode/u8_textprep.c b/module/unicode/u8_textprep.c
index f5ab77951..26cc39f3b 100644
--- a/module/unicode/u8_textprep.c
+++ b/module/unicode/u8_textprep.c
@@ -2133,13 +2133,18 @@ u8_textprep_str(char *inarray, size_t *inlen, char *outarray, size_t *outlen,
}
#if defined(_KERNEL) && defined(HAVE_SPL)
-#include <linux/module_compat.h>
+static int __init
+unicode_init(void) {
+ return (0);
+}
-static int unicode_init(void) { return 0; }
-static int unicode_fini(void) { return 0; }
+static void __exit
+unicode_fini(void)
+{
+}
-spl_module_init(unicode_init);
-spl_module_exit(unicode_fini);
+module_init(unicode_init);
+module_exit(unicode_fini);
MODULE_DESCRIPTION("Unicode implementation");
MODULE_AUTHOR(ZFS_META_AUTHOR);