From 93ce2b4ca5a40c41ac945cd3aaf4a4a22bb751e1 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 15 Feb 2018 17:53:18 -0800 Subject: 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 Reviewed-by: Olaf Faaland Reviewed-by: Matthew Ahrens Reviewed-by: Pavel Zakharov Signed-off-by: Brian Behlendorf TEST_ZIMPORT_SKIP="yes" Closes #7556 --- module/icp/algs/edonr/edonr.c | 7 +------ module/icp/algs/edonr/edonr_byteorder.h | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'module/icp/algs/edonr') diff --git a/module/icp/algs/edonr/edonr.c b/module/icp/algs/edonr/edonr.c index 8ae989890..7c677095f 100644 --- a/module/icp/algs/edonr/edonr.c +++ b/module/icp/algs/edonr/edonr.c @@ -29,12 +29,7 @@ * Portions copyright (c) 2013, Saso Kiselkov, All rights reserved */ -/* determine where we can get bcopy/bzero declarations */ -#ifdef _KERNEL -#include -#else -#include -#endif +#include #include #include diff --git a/module/icp/algs/edonr/edonr_byteorder.h b/module/icp/algs/edonr/edonr_byteorder.h index d17e8f1fd..532dfd743 100644 --- a/module/icp/algs/edonr/edonr_byteorder.h +++ b/module/icp/algs/edonr/edonr_byteorder.h @@ -34,7 +34,7 @@ #ifndef _CRYPTO_EDONR_BYTEORDER_H #define _CRYPTO_EDONR_BYTEORDER_H - +#include #include #if defined(__BYTE_ORDER) -- cgit v1.2.3