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

lib/libspl/include/sys/fm/util.h

@@ -27,4 +27,7 @@
 #ifndef _LIBSPL_SYS_FM_UTIL_H
 #define _LIBSPL_SYS_FM_UTIL_H
 
+static inline void fm_init(void) { }
+static inline void fm_fini(void) { }
+
 #endif

module/nvpair/Makefile.in

@@ -7,3 +7,4 @@ obj-m := ${MODULE}.o
 
 ${MODULE}-objs += nvpair.o
 ${MODULE}-objs += nvpair_alloc_spl.o
+${MODULE}-objs += nvpair_alloc_fixed.o

module/nvpair/nvpair_alloc_fixed.c

@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include <sys/stropts.h>
 #include <sys/isa_defs.h>
@@ -118,3 +118,7 @@ const nv_alloc_ops_t nv_fixed_ops_def = {
 };
 
 const nv_alloc_ops_t *nv_fixed_ops = &nv_fixed_ops_def;
+
+#if defined(_KERNEL) && defined(HAVE_SPL)
+EXPORT_SYMBOL(nv_fixed_ops);
+#endif