From 7121867aea8cfd6adef73c6224584d50f8a2dfc6 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 8 Mar 2010 10:45:19 -0800 Subject: [PATCH] Configure checks for kernel build options incompatible with the license Changes for linux-kernel-module topic branch, see commit fd75782. --- module/avl/avl.c | 6 ++++-- module/nvpair/nvpair.c | 6 ++++-- module/unicode/u8_textprep.c | 6 ++++-- module/zcommon/zfs_prop.c | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/module/avl/avl.c b/module/avl/avl.c index 728bd87234..eb8bfcd052 100644 --- a/module/avl/avl.c +++ b/module/avl/avl.c @@ -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); diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c index 5bee964294..02abfdbefb 100644 --- a/module/nvpair/nvpair.c +++ b/module/nvpair/nvpair.c @@ -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); diff --git a/module/unicode/u8_textprep.c b/module/unicode/u8_textprep.c index 37fb2e5a46..9f90e5056d 100644 --- a/module/unicode/u8_textprep.c +++ b/module/unicode/u8_textprep.c @@ -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); diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c index 45943602c0..ec93ae4c99 100644 --- a/module/zcommon/zfs_prop.c +++ b/module/zcommon/zfs_prop.c @@ -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);