Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

2010-06-16 10:39:00 -07:00 · 2010-06-16 10:39:00 -07:00 · f57c0267cf
parent a1f8349461 916ff9bb97
commit f57c0267cf
1 changed files with 0 additions and 3 deletions
--- a/module/zfs/include/sys/zfs_context.h
+++ b/module/zfs/include/sys/zfs_context.h
@ -59,11 +59,8 @@ extern "C" {
 #include <sys/uio.h>
 #include <sys/zfs_debug.h>
 #include <sys/fm/fs/zfs.h>
-#include <sys/fm/util.h>
 #include <sys/sunddi.h>

-#define	CPU_SEQID	(CPU->cpu_seqid)
-
 #ifdef	__cplusplus
 }
 #endif