Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
This commit is contained in:
commit
b17fd93022
|
@ -2130,3 +2130,26 @@ u8_textprep_str(char *inarray, size_t *inlen, char *outarray, size_t *outlen,
|
|||
|
||||
return (ret_val);
|
||||
}
|
||||
|
||||
#if defined(_KERNEL) && defined(HAVE_SPL)
|
||||
static int __init unicode_init(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void unicode_fini(void)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
module_init(unicode_init);
|
||||
module_exit(unicode_fini);
|
||||
|
||||
MODULE_AUTHOR("Sun Microsystems, Inc");
|
||||
MODULE_DESCRIPTION("Unicode implementation");
|
||||
MODULE_LICENSE("CDDL");
|
||||
|
||||
EXPORT_SYMBOL(u8_validate);
|
||||
EXPORT_SYMBOL(u8_strcmp);
|
||||
EXPORT_SYMBOL(u8_textprep_str);
|
||||
#endif
|
||||
|
|
|
@ -853,3 +853,12 @@ uconv_u8tou32(const uchar_t *u8s, size_t *utf8len,
|
|||
|
||||
return (0);
|
||||
}
|
||||
|
||||
#if defined(_KERNEL) && defined(HAVE_SPL)
|
||||
EXPORT_SYMBOL(uconv_u16tou32);
|
||||
EXPORT_SYMBOL(uconv_u16tou8);
|
||||
EXPORT_SYMBOL(uconv_u32tou16);
|
||||
EXPORT_SYMBOL(uconv_u32tou8);
|
||||
EXPORT_SYMBOL(uconv_u8tou16);
|
||||
EXPORT_SYMBOL(uconv_u8tou32);
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue