Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch

module/zfs/rrwlock.c

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

module/zfs/zfs_acl.c

@@ -23,6 +23,8 @@
  * Use is subject to license terms.
  */
 
+#ifdef HAVE_ZPL
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
@@ -2678,3 +2680,5 @@ zfs_zaccess_rename(znode_t *sdzp, znode_t *szp, znode_t *tdzp,
 
 	return (error);
 }
+
+#endif /* HAVE_ZPL */