diff options
| author | Matthew Macy <[email protected]> | 2019-10-31 15:45:58 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-10-31 15:45:58 -0700 |
| commit | c4ae27c763acc2b29747e98a4318be9516c43e70 (patch) | |
| tree | 0013604ed75b39ebb13717453546e2f7353ecabe /include | |
| parent | ab44be142a57023a539b66eb06e795b4924fbc9f (diff) | |
Move sha2.h to platform code
FreeBSD has its own sha routines that the port uses.
Reviewed-by: Jorgen Lundman <[email protected]>
Reviewed-by: Igor Kozhukhov <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Matt Macy <[email protected]>
Closes #9530
Diffstat (limited to 'include')
| -rw-r--r-- | include/os/linux/zfs/sys/Makefile.am | 1 | ||||
| -rw-r--r-- | include/os/linux/zfs/sys/sha2.h (renamed from include/sys/sha2.h) | 4 | ||||
| -rw-r--r-- | include/sys/Makefile.am | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/include/os/linux/zfs/sys/Makefile.am b/include/os/linux/zfs/sys/Makefile.am index c4e2df0d7..ca8d83e26 100644 --- a/include/os/linux/zfs/sys/Makefile.am +++ b/include/os/linux/zfs/sys/Makefile.am @@ -1,5 +1,6 @@ KERNEL_H = \ $(top_srcdir)/include/os/linux/zfs/sys/policy.h \ + $(top_srcdir)/include/os/linux/zfs/sys/sha2.h \ $(top_srcdir)/include/os/linux/zfs/sys/trace_acl.h \ $(top_srcdir)/include/os/linux/zfs/sys/trace_arc.h \ $(top_srcdir)/include/os/linux/zfs/sys/trace_common.h \ diff --git a/include/sys/sha2.h b/include/os/linux/zfs/sys/sha2.h index 9039835f1..4dd966b6c 100644 --- a/include/sys/sha2.h +++ b/include/os/linux/zfs/sys/sha2.h @@ -27,11 +27,7 @@ #ifndef _SYS_SHA2_H #define _SYS_SHA2_H -#ifdef _KERNEL #include <sys/types.h> /* for uint_* */ -#else -#include <stdint.h> -#endif #ifdef __cplusplus extern "C" { diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am index 9aad98f24..4d0afc18c 100644 --- a/include/sys/Makefile.am +++ b/include/sys/Makefile.am @@ -60,7 +60,6 @@ COMMON_H = \ $(top_srcdir)/include/sys/rrwlock.h \ $(top_srcdir)/include/sys/sa.h \ $(top_srcdir)/include/sys/sa_impl.h \ - $(top_srcdir)/include/sys/sha2.h \ $(top_srcdir)/include/sys/skein.h \ $(top_srcdir)/include/sys/spa_boot.h \ $(top_srcdir)/include/sys/spa_checkpoint.h \ |