freebsd: changes necessary to coexist with dtrace in tree

Fix header conflicts when building zfs with openzfs as a vendor import.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes #10497

module/os/freebsd/spl/spl_misc.c

@@ -34,15 +34,24 @@ __FBSDID("$FreeBSD$");
 #include <sys/limits.h>
 #include <sys/misc.h>
 #include <sys/sysctl.h>
+#include <sys/vnode.h>
 
 #include <sys/zfs_context.h>
 
-char hw_serial[11] = "0";
-
 static struct opensolaris_utsname hw_utsname = {
 	.machine = MACHINE
 };
 
+#ifndef KERNEL_STATIC
+char hw_serial[11] = "0";
+
+utsname_t *
+utsname(void)
+{
+	return (&hw_utsname);
+}
+#endif
+
 static void
 opensolaris_utsname_init(void *arg)
 {
@@ -98,10 +107,6 @@ spl_panic(const char *file, const char *func, int line, const char *fmt, ...)
 	va_end(ap);
 }
 
-utsname_t *
-utsname(void)
-{
-	return (&hw_utsname);
-}
+
 SYSINIT(opensolaris_utsname_init, SI_SUB_TUNABLES, SI_ORDER_ANY,
     opensolaris_utsname_init, NULL);

module/os/freebsd/spl/spl_sysevent.c

@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
+#include <sys/list.h>
 #include <sys/sbuf.h>
 #include <sys/nvpair.h>
 #include <sys/sunddi.h>