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

2009-01-09 15:11:58 -08:00 · 2009-01-09 15:11:58 -08:00 · 8f4340d3e8
parent 5c530132fc 402405558a
commit 8f4340d3e8
1 changed files with 3 additions and 0 deletions
--- a/module/zfs/rrwlock.c
+++ b/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 */