Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-03-08 10:51:39 -08:00
commit 5f863d5936
4 changed files with 16 additions and 8 deletions

View File

@ -1033,15 +1033,17 @@ done:
}
#if defined(_KERNEL) && defined(HAVE_SPL)
#include "zfs_config.h"
static int avl_init(void) { return 0; }
static int avl_fini(void) { return 0; }
spl_module_init(avl_init);
spl_module_exit(avl_fini);
MODULE_AUTHOR("Sun Microsystems, Inc");
MODULE_DESCRIPTION("Generic AVL tree implementation");
MODULE_LICENSE("CDDL");
MODULE_AUTHOR(ZFS_META_AUTHOR);
MODULE_LICENSE(ZFS_META_LICENSE);
EXPORT_SYMBOL(avl_create);
EXPORT_SYMBOL(avl_find);

View File

@ -3246,15 +3246,17 @@ nvs_xdr(nvstream_t *nvs, nvlist_t *nvl, char *buf, size_t *buflen)
}
#if defined(_KERNEL) && defined(HAVE_SPL)
#include "zfs_config.h"
static int nvpair_init(void) { return 0; }
static int nvpair_fini(void) { return 0; }
spl_module_init(nvpair_init);
spl_module_exit(nvpair_fini);
MODULE_AUTHOR("Sun Microsystems, Inc");
MODULE_DESCRIPTION("Generic name/value pair implementation");
MODULE_LICENSE("CDDL");
MODULE_AUTHOR(ZFS_META_AUTHOR);
MODULE_LICENSE(ZFS_META_LICENSE);
EXPORT_SYMBOL(nv_alloc_init);
EXPORT_SYMBOL(nv_alloc_reset);

View File

@ -2133,15 +2133,17 @@ u8_textprep_str(char *inarray, size_t *inlen, char *outarray, size_t *outlen,
}
#if defined(_KERNEL) && defined(HAVE_SPL)
#include "zfs_config.h"
static int unicode_init(void) { return 0; }
static int unicode_fini(void) { return 0; }
spl_module_init(unicode_init);
spl_module_exit(unicode_fini);
MODULE_AUTHOR("Sun Microsystems, Inc");
MODULE_DESCRIPTION("Unicode implementation");
MODULE_LICENSE("CDDL");
MODULE_AUTHOR(ZFS_META_AUTHOR);
MODULE_LICENSE(ZFS_META_LICENSE);
EXPORT_SYMBOL(u8_validate);
EXPORT_SYMBOL(u8_strcmp);

View File

@ -534,15 +534,17 @@ zfs_prop_align_right(zfs_prop_t prop)
#endif
#if defined(_KERNEL) && defined(HAVE_SPL)
#include "zfs_config.h"
static int zcommon_init(void) { return 0; }
static int zcommon_fini(void) { return 0; }
spl_module_init(zcommon_init);
spl_module_exit(zcommon_fini);
MODULE_AUTHOR("Sun Microsystems, Inc");
MODULE_DESCRIPTION("Generic ZFS support");
MODULE_LICENSE("CDDL");
MODULE_AUTHOR(ZFS_META_AUTHOR);
MODULE_LICENSE(ZFS_META_LICENSE);
/* zfs dataset property functions */
EXPORT_SYMBOL(zfs_userquota_prop_prefixes);