From de6b729e338a6ad7bf0523f5864448612afcf3f2 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 23 Dec 2008 13:44:15 -0800
Subject: [PATCH 1/2] Add Makefile tweak

---
 module/zfs/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/zfs/Makefile.in b/module/zfs/Makefile.in
index bc0ed9c100..558cfac22b 100644
--- a/module/zfs/Makefile.in
+++ b/module/zfs/Makefile.in
@@ -79,7 +79,7 @@ ${MODULE}-objs += zfs_fuid.o
 # ${MODULE}-objs += zfs_rlock.o
 # ${MODULE}-objs += zfs_vfsops.o
 # ${MODULE}-objs += zfs_vnops.o
-${MODULE}-objs += zfs_znode.o
+# ${MODULE}-objs += zfs_znode.o
 ${MODULE}-objs += zil.o
 ${MODULE}-objs += zio.o
 ${MODULE}-objs += zio_checksum.o

From ffb877324120674b7ddd5d462a52c1e182ba25c2 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 23 Dec 2008 13:47:22 -0800
Subject: [PATCH 2/2] Take out page map functions for now

---
 module/zfs/include/sys/zfs_znode.h | 2 ++
 module/zfs/zfs_vnops.c             | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/module/zfs/include/sys/zfs_znode.h b/module/zfs/include/sys/zfs_znode.h
index db40968fa2..57fd8d6dfa 100644
--- a/module/zfs/include/sys/zfs_znode.h
+++ b/module/zfs/include/sys/zfs_znode.h
@@ -338,8 +338,10 @@ extern void zfs_log_acl(zilog_t *zilog, dmu_tx_t *tx, znode_t *zp,
 extern void zfs_xvattr_set(znode_t *zp, xvattr_t *xvap);
 extern void zfs_upgrade(zfsvfs_t *zfsvfs, dmu_tx_t *tx);
 
+#if defined(HAVE_UIO_RW)
 extern caddr_t zfs_map_page(page_t *, enum seg_rw);
 extern void zfs_unmap_page(page_t *, caddr_t);
+#endif /* HAVE_UIO_RW */
 
 extern zil_get_data_t zfs_get_data;
 extern zil_replay_func_t *zfs_replay_vector[TX_MAX_TYPE];
diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c
index 8e0037e37d..c1dc7b5509 100644
--- a/module/zfs/zfs_vnops.c
+++ b/module/zfs/zfs_vnops.c
@@ -317,6 +317,7 @@ zfs_ioctl(vnode_t *vp, int com, intptr_t data, int flag, cred_t *cred,
 	return (ENOTTY);
 }
 
+#if defined(_KERNEL) && defined(HAVE_UIO_RW)
 /*
  * Utility functions to map and unmap a single physical page.  These
  * are used to manage the mappable copies of ZFS file data, and therefore
@@ -341,6 +342,7 @@ zfs_unmap_page(page_t *pp, caddr_t addr)
 		ppmapout(addr);
 	}
 }
+#endif /* _KERNEL && HAVE_UIO_RW */
 
 /*
  * When a file is memory mapped, we must keep the IO data synchronized