Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch

zfs/lib/libspl/include/sys/time.h

@@ -27,11 +27,8 @@
 #ifndef _SOL_SYS_TIME_H
 #define _SOL_SYS_TIME_H
 
-#include <sys/types.h>
 #include_next <sys/time.h>
-
-typedef longlong_t	hrtime_t;
-typedef struct timespec	timestruc_t;
+#include <sys/types.h>
 
 #ifndef NANOSEC
 #define NANOSEC 1000000000

zfs/lib/libspl/include/sys/types.h

@@ -87,4 +87,7 @@ typedef union {
 } lloff_t;
 #endif
 
+typedef longlong_t hrtime_t;
+typedef struct timespec timestruc_t;
+
 #endif