From b86297e4d3d75c97cf1f76b9f596f639aabf47b0 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 19 Dec 2008 12:32:08 -0800
Subject: [PATCH 1/2] Add missing umem bits

---
 lib/libspl/include/umem.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/libspl/include/umem.h b/lib/libspl/include/umem.h
index 3e19aff9ec..0ed55ae5af 100644
--- a/lib/libspl/include/umem.h
+++ b/lib/libspl/include/umem.h
@@ -42,9 +42,22 @@
 extern "C" {
 #endif
 
+typedef void vmem_t;
+
+/*
+ * Flags for umem_alloc/umem_free
+ */
 #define UMEM_DEFAULT		0x0000  /* normal -- may fail */
 #define UMEM_NOFAIL		0x0100  /* Never fails */
 
+/*
+ * Flags for umem_cache_create()
+ */
+#define UMC_NOTOUCH		0x00010000
+#define UMC_NODEBUG		0x00020000
+#define UMC_NOMAGAZINE		0x00040000
+#define UMC_NOHASH		0x00080000
+
 #define UMEM_CACHE_NAMELEN	31
 
 typedef int umem_nofail_callback_t(void);

From 93a6c0b0b9488e60a8dd49ecd22c28e95f19eeff Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 19 Dec 2008 12:33:22 -0800
Subject: [PATCH 2/2] Fix c90 for() issue

---
 module/zfs/zio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/zfs/zio.c b/module/zfs/zio.c
index e44d2e56c1..534b77db05 100644
--- a/module/zfs/zio.c
+++ b/module/zfs/zio.c
@@ -909,8 +909,9 @@ zio_taskq_member(zio_t *zio, enum zio_taskq_type q)
 {
 	kthread_t *executor = zio->io_executor;
 	spa_t *spa = zio->io_spa;
+	zio_type_t t;
 
-	for (zio_type_t t = 0; t < ZIO_TYPES; t++)
+	for (t = 0; t < ZIO_TYPES; t++)
 		if (taskq_member(spa->spa_zio_taskq[t][q], executor))
 			return (B_TRUE);