summaryrefslogtreecommitdiffstats
path: root/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2014-01-16 15:57:39 +0000
committeravg <avg@FreeBSD.org>2014-01-16 15:57:39 +0000
commit26096ba436a54f225f8e56bb965a0e2214256c71 (patch)
treea24d61eb5c3c255647d4c4bb29075b63b1da94fc /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
parent81894fb568ed816e9e9f3a43f778e69751857339 (diff)
downloadFreeBSD-src-26096ba436a54f225f8e56bb965a0e2214256c71.zip
FreeBSD-src-26096ba436a54f225f8e56bb965a0e2214256c71.tar.gz
MFC r258632,258704: MFV r255255: 4045 zfs write throttle & i/o scheduler
performance work Sponsored by: HybridCluster [merge]
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
index b76349b..5102040 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
@@ -24,7 +24,7 @@
*/
/*
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
*/
#ifndef _SYS_ZFS_CONTEXT_H
@@ -94,10 +94,11 @@ extern "C" {
#include <sys/sunddi.h>
#ifdef illumos
#include <sys/cyclic.h>
+#include <sys/callo.h>
#else /* FreeBSD */
#include <sys/callout.h>
#endif
-
+#include <sys/disp.h>
#include <machine/stdarg.h>
#include <vm/vm.h>
OpenPOWER on IntegriCloud