Try to fix build error

kernelOfTruth · Mar 23, 2015 · 8e99d78 · 8e99d78
1 parent 9442025
commit 8e99d78
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/include/sys/abd.h b/include/sys/abd.h
@@ -42,10 +42,18 @@ extern "C" {
 
 #define	ARC_BUF_DATA_MAGIC 0xa7cb0fda
 
-#if defined(ZFS_DEBUG) && !defined(_KERNEL)
+#ifndef _KERNEL
+
+#ifndef PAGE_SIZE
+#define	PAGE_SIZE 4096
+#endif
+
+#ifdef ZFS_DEBUG
 #define	DEBUG_ABD
 #endif
 
+#endif	/* !_KERNEL */
+
 typedef struct arc_buf_data {
 #ifdef DEBUG_ABD
 	char		pad[PAGE_SIZE];	/* debug, coredumps when accessed */

diff --git a/module/zfs/abd.c b/module/zfs/abd.c
@@ -43,10 +43,6 @@
 /*
  * page
  */
-#ifndef PAGE_SIZE
-#define	PAGE_SIZE 4096
-#endif
-
 struct page;
 
 #define	alloc_page(gfp) \
@@ -105,6 +101,8 @@ sg_next(struct scatterlist *sg)
 
 #define	kmap(page)			((void *)page)
 #define	kunmap(page)			do { } while (0)
+#define	KM_USER0			(0)
+#define	KM_USER1			(1)
 #define	zfs_kmap_atomic(page, type)	((void *)page)
 #define	zfs_kunmap_atomic(addr, type)	do { } while (0)
 #define	pagefault_disable()		do { } while (0)
@@ -165,7 +163,7 @@ abd_miter_init_km(struct abd_miter *aiter, abd_t *abd, int rw, int km)
 	aiter->nents = abd->abd_nents;
 	aiter->rw = rw;
 #ifndef HAVE_1ARG_KMAP_ATOMIC
-	aiter->km_type = km;
+	aiter->km_type = (km ? KM_USER1 : KM_USER0);
 #endif
 }
 
@@ -207,7 +205,7 @@ abd_miter_map_x(struct abd_miter *aiter, int atomic)
 
 		if (atomic)
 			paddr = zfs_kmap_atomic(sg_page(aiter->sg),
-			    (aiter->km_type ? KM_USER1 : KM_USER0));
+			    aiter->km_type);
 		else
 			paddr = kmap(sg_page(aiter->sg));
 	}
@@ -237,8 +235,7 @@ abd_miter_unmap_x(struct abd_miter *aiter, int atomic)
 		if (atomic) {
 			if (aiter->rw == ABD_MITER_W)
 				flush_kernel_dcache_page(sg_page(aiter->sg));
-			zfs_kunmap_atomic(paddr,
-			    (aiter->km_type ? KM_USER1 : KM_USER0));
+			zfs_kunmap_atomic(paddr, aiter->km_type);
 		} else {
 			kunmap(sg_page(aiter->sg));
 		}