From e7e0111a7c70008739f880d5e0b0276e539a6b34 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 23 Dec 2008 13:07:27 -0800
Subject: [PATCH 1/2] Update makefile

---
 module/zcommon/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/zcommon/Makefile.in b/module/zcommon/Makefile.in
index 4627a93962..4e84b335ee 100644
--- a/module/zcommon/Makefile.in
+++ b/module/zcommon/Makefile.in
@@ -5,10 +5,10 @@ DISTFILES += zfs_prop.c zpool_prop.c zprop_common.c
 MODULE := zcommon
 
 EXTRA_CFLAGS  = @KERNELCPPFLAGS@
-EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
-EXTRA_CFLAGS += -I@MODDIR@/spl/include
 EXTRA_CFLAGS += -I@MODDIR@/avl/include
 EXTRA_CFLAGS += -I@MODDIR@/nvpair/include
+EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
+EXTRA_CFLAGS += -I@MODDIR@/zfs/include
 
 obj-m := ${MODULE}.o
 

From 7725fe743116fb93a14d94ec154c1502d100bfe4 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 23 Dec 2008 13:11:03 -0800
Subject: [PATCH 2/2] Remove CPU_SEQID from context, available in SPL. 
 Additionally add module magic for zcommon

---
 module/zcommon/zfs_prop.c            | 18 ++++++++++++++++++
 module/zfs/include/sys/zfs_context.h |  2 --
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c
index fc2ce65810..150d28109a 100644
--- a/module/zcommon/zfs_prop.c
+++ b/module/zcommon/zfs_prop.c
@@ -514,4 +514,22 @@ EXPORT_SYMBOL(zfs_prop_user);
 EXPORT_SYMBOL(zfs_prop_index_to_string);
 EXPORT_SYMBOL(zfs_prop_string_to_index);
 EXPORT_SYMBOL(zfs_prop_valid_for_type);
+
+static int __init zcommon_init(void)
+{
+	return 0;
+}
+
+static void zcommon_fini(void)
+{
+	return;
+}
+
+module_init(zcommon_init);
+module_exit(zcommon_fini);
+
+MODULE_AUTHOR("Sun Microsystems, Inc");
+MODULE_DESCRIPTION("Generic ZFS support");
+MODULE_LICENSE("CDDL");
+
 #endif
diff --git a/module/zfs/include/sys/zfs_context.h b/module/zfs/include/sys/zfs_context.h
index a5be3e1303..effef35ee6 100644
--- a/module/zfs/include/sys/zfs_context.h
+++ b/module/zfs/include/sys/zfs_context.h
@@ -64,8 +64,6 @@ extern "C" {
 #include <sys/sysevent/eventdefs.h>
 #include <sys/fm/util.h>
 
-#define	CPU_SEQID	(CPU->cpu_seqid)
-
 #ifdef	__cplusplus
 }
 #endif