From 4c741b2f9dbcce4c72c38bab7501b94786187024 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Mon, 5 Jan 2009 15:40:56 -0800
Subject: [PATCH 1/2] Revert changes and resolve include issue by adjusting
 include path ordering

---
 module/unicode/u8_textprep.c | 2 +-
 module/unicode/uconv.c       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/unicode/u8_textprep.c b/module/unicode/u8_textprep.c
index 93b8f0ba65..72299b51f3 100644
--- a/module/unicode/u8_textprep.c
+++ b/module/unicode/u8_textprep.c
@@ -45,11 +45,11 @@
 #include <sys/ddi.h>
 #include <sys/sunddi.h>
 #else
+#include <sys/u8_textprep.h>
 #include <strings.h>
 #endif	/* _KERNEL */
 #include <sys/byteorder.h>
 #include <sys/errno.h>
-#include <sys/u8_textprep.h>
 #include <sys/u8_textprep_data.h>
 
 
diff --git a/module/unicode/uconv.c b/module/unicode/uconv.c
index e3aee2acab..a9fa9cf33a 100644
--- a/module/unicode/uconv.c
+++ b/module/unicode/uconv.c
@@ -42,10 +42,11 @@
 #include <sys/debug.h>
 #include <sys/kmem.h>
 #include <sys/sunddi.h>
+#else
+#include <sys/u8_textprep.h>
 #endif	/* _KERNEL */
 #include <sys/byteorder.h>
 #include <sys/errno.h>
-#include <sys/u8_textprep.h>
 
 
 /*

From 760d78b9f8e42f5c97f7ee8a05ba8153c5dd181e Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Mon, 5 Jan 2009 15:42:56 -0800
Subject: [PATCH 2/2] Move default include paths after custom include paths so
 local stuff gets picked up first

---
 module/avl/Makefile.in     | 4 ++--
 module/nvpair/Makefile.in  | 4 ++--
 module/unicode/Makefile.in | 4 ++--
 module/zcommon/Makefile.in | 4 ++--
 module/zfs/Makefile.in     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/module/avl/Makefile.in b/module/avl/Makefile.in
index 3a49f35cd5..32ecee49ab 100644
--- a/module/avl/Makefile.in
+++ b/module/avl/Makefile.in
@@ -3,8 +3,8 @@ DISTFILES = avl.c
 
 MODULE := zavl
 
-EXTRA_CFLAGS  = @KERNELCPPFLAGS@
-EXTRA_CFLAGS += -I@MODDIR@/avl/include
+EXTRA_CFLAGS  = -I@MODDIR@/avl/include
+EXTRA_CFLAGS += @KERNELCPPFLAGS@
 
 obj-m := ${MODULE}.o
 
diff --git a/module/nvpair/Makefile.in b/module/nvpair/Makefile.in
index 17b7cc892a..b91a0c6b02 100644
--- a/module/nvpair/Makefile.in
+++ b/module/nvpair/Makefile.in
@@ -3,8 +3,8 @@ DISTFILES = nvpair.c
 
 MODULE := znvpair
 
-EXTRA_CFLAGS  = @KERNELCPPFLAGS@
-EXTRA_CFLAGS += -I@MODDIR@/nvpair/include
+EXTRA_CFLAGS  = -I@MODDIR@/nvpair/include
+EXTRA_CFLAGS += @KERNELCPPFLAGS@
 
 obj-m := ${MODULE}.o
 
diff --git a/module/unicode/Makefile.in b/module/unicode/Makefile.in
index aa2120d604..2a348fc09c 100644
--- a/module/unicode/Makefile.in
+++ b/module/unicode/Makefile.in
@@ -3,8 +3,8 @@ DISTFILES = u8_textprep.c uconv.c
 
 MODULE := zunicode
 
-EXTRA_CFLAGS  = @KERNELCPPFLAGS@
-EXTRA_CFLAGS += -I@MODDIR@/unicode/include
+EXTRA_CFLAGS  = -I@MODDIR@/unicode/include
+EXTRA_CFLAGS += @KERNELCPPFLAGS@
 
 obj-m := ${MODULE}.o
 
diff --git a/module/zcommon/Makefile.in b/module/zcommon/Makefile.in
index 010e77a855..c9510561fb 100644
--- a/module/zcommon/Makefile.in
+++ b/module/zcommon/Makefile.in
@@ -4,12 +4,12 @@ DISTFILES += zfs_prop.c zpool_prop.c zprop_common.c
 
 MODULE := zcommon
 
-EXTRA_CFLAGS  = @KERNELCPPFLAGS@
-EXTRA_CFLAGS += -I@MODDIR@/avl/include
+EXTRA_CFLAGS  = -I@MODDIR@/avl/include
 EXTRA_CFLAGS += -I@MODDIR@/nvpair/include
 EXTRA_CFLAGS += -I@MODDIR@/unicode/include
 EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
 EXTRA_CFLAGS += -I@MODDIR@/zfs/include
+EXTRA_CFLAGS += @KERNELCPPFLAGS@
 
 obj-m := ${MODULE}.o
 
diff --git a/module/zfs/Makefile.in b/module/zfs/Makefile.in
index bd72636ccf..0e48a39202 100644
--- a/module/zfs/Makefile.in
+++ b/module/zfs/Makefile.in
@@ -11,12 +11,12 @@ DISTFILES += zfs_znode.o zil.o zio.o zio_checksum.o zio_compress.o zio_inject.o
 
 MODULE := zpool
 
-EXTRA_CFLAGS  = @KERNELCPPFLAGS@
-EXTRA_CFLAGS += -I@MODDIR@/zfs/include
+EXTRA_CFLAGS  = -I@MODDIR@/zfs/include
 EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
 EXTRA_CFLAGS += -I@MODDIR@/avl/include
 EXTRA_CFLAGS += -I@MODDIR@/nvpair/include
 EXTRA_CFLAGS += -I@MODDIR@/unicode/include
+EXTRA_CFLAGS += @KERNELCPPFLAGS@
 
 obj-m := ${MODULE}.o