diff options
| author | Brian Behlendorf <[email protected]> | 2018-02-15 17:53:18 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-05-29 16:00:33 -0700 |
| commit | 93ce2b4ca5a40c41ac945cd3aaf4a4a22bb751e1 (patch) | |
| tree | 6832f5c9dfdbe0f0bd5c8708344a769676b1f95d /module/unicode | |
| parent | 1272941f49321bcb7b26025670720c98785427ee (diff) | |
Update build system and packaging
Minimal changes required to integrate the SPL sources in to the
ZFS repository build infrastructure and packaging.
Build system and packaging:
* Renamed SPL_* autoconf m4 macros to ZFS_*.
* Removed redundant SPL_* autoconf m4 macros.
* Updated the RPM spec files to remove SPL package dependency.
* The zfs package obsoletes the spl package, and the zfs-kmod
package obsoletes the spl-kmod package.
* The zfs-kmod-devel* packages were updated to add compatibility
symlinks under /usr/src/spl-x.y.z until all dependent packages
can be updated. They will be removed in a future release.
* Updated copy-builtin script for in-kernel builds.
* Updated DKMS package to include the spl.ko.
* Updated stale AUTHORS file to include all contributors.
* Updated stale COPYRIGHT and included the SPL as an exception.
* Renamed README.markdown to README.md
* Renamed OPENSOLARIS.LICENSE to LICENSE.
* Renamed DISCLAIMER to NOTICE.
Required code changes:
* Removed redundant HAVE_SPL macro.
* Removed _BOOT from nvpairs since it doesn't apply for Linux.
* Initial header cleanup (removal of empty headers, refactoring).
* Remove SPL repository clone/build from zimport.sh.
* Use of DEFINE_RATELIMIT_STATE and DEFINE_SPINLOCK removed due
to build issues when forcing C99 compilation.
* Replaced legacy ACCESS_ONCE with READ_ONCE.
* Include needed headers for `current` and `EXPORT_SYMBOL`.
Reviewed-by: Tony Hutter <[email protected]>
Reviewed-by: Olaf Faaland <[email protected]>
Reviewed-by: Matthew Ahrens <[email protected]>
Reviewed-by: Pavel Zakharov <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
TEST_ZIMPORT_SKIP="yes"
Closes #7556
Diffstat (limited to 'module/unicode')
| -rw-r--r-- | module/unicode/u8_textprep.c | 9 | ||||
| -rw-r--r-- | module/unicode/uconv.c | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/module/unicode/u8_textprep.c b/module/unicode/u8_textprep.c index 0330032fa..4e6105b2e 100644 --- a/module/unicode/u8_textprep.c +++ b/module/unicode/u8_textprep.c @@ -36,18 +36,13 @@ */ #include <sys/types.h> -#ifdef _KERNEL +#include <sys/strings.h> #include <sys/param.h> #include <sys/sysmacros.h> -#include <sys/systm.h> #include <sys/debug.h> #include <sys/kmem.h> -#include <sys/ddi.h> #include <sys/sunddi.h> -#else #include <sys/u8_textprep.h> -#include <strings.h> -#endif /* _KERNEL */ #include <sys/byteorder.h> #include <sys/errno.h> #include <sys/u8_textprep_data.h> @@ -2130,7 +2125,7 @@ u8_textprep_str(char *inarray, size_t *inlen, char *outarray, size_t *outlen, return (ret_val); } -#if defined(_KERNEL) && defined(HAVE_SPL) +#if defined(_KERNEL) static int __init unicode_init(void) { diff --git a/module/unicode/uconv.c b/module/unicode/uconv.c index 7a8278322..d812d5f96 100644 --- a/module/unicode/uconv.c +++ b/module/unicode/uconv.c @@ -38,7 +38,6 @@ #ifdef _KERNEL #include <sys/param.h> #include <sys/sysmacros.h> -#include <sys/systm.h> #include <sys/debug.h> #include <sys/kmem.h> #include <sys/sunddi.h> @@ -854,7 +853,7 @@ uconv_u8tou32(const uchar_t *u8s, size_t *utf8len, return (0); } -#if defined(_KERNEL) && defined(HAVE_SPL) +#if defined(_KERNEL) EXPORT_SYMBOL(uconv_u16tou32); EXPORT_SYMBOL(uconv_u16tou8); EXPORT_SYMBOL(uconv_u32tou16); |