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

lib/libzpool/Makefile.am

@@ -53,7 +53,6 @@ libzpool_la_SOURCES = \
 	${top_srcdir}/module/zfs/lzjb.c \
 	${top_srcdir}/module/zfs/metaslab.c \
 	${top_srcdir}/module/zfs/refcount.c \
-	${top_srcdir}/module/zfs/rrwlock.c \
 	${top_srcdir}/module/zfs/sha256.c \
 	${top_srcdir}/module/zfs/spa.c \
 	${top_srcdir}/module/zfs/spa_boot.c \

module/zfs/rrwlock.c

@@ -23,6 +23,8 @@
  * Use is subject to license terms.
  */
 
+#ifdef HAVE_ZPL
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/refcount.h>
@@ -247,3 +249,4 @@ rrw_held(rrwlock_t *rrl, krw_t rw)
 
 	return (held);
 }
+#endif /* HAVE_ZPL */