diff options
| author | avg <avg@FreeBSD.org> | 2017-03-04 13:03:31 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2017-03-04 13:03:31 +0000 |
| commit | ee895f7b426627aad1638091f62f0eb122a17460 (patch) | |
| tree | 822fb78084d564fa54c140dfab630370fb3397e6 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c | |
| parent | a3480d5c9e3eb277d85d4bef6f03fd62eb864799 (diff) | |
| download | FreeBSD-src-ee895f7b426627aad1638091f62f0eb122a17460.zip FreeBSD-src-ee895f7b426627aad1638091f62f0eb122a17460.tar.gz | |
MFC r283291: don't use CALLOUT_MPSAFE with callout_init()
The main purpose of this MFC is to reduce conflicts for other merges.
Parts of the original change have already "trickled down" via individual MFCs.
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c index 2fd7f49..8cee055 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c @@ -698,7 +698,7 @@ spa_add(const char *name, nvlist_t *config, const char *altroot) mutex_exit(&cpu_lock); #else /* !illumos */ #ifdef _KERNEL - callout_init(&spa->spa_deadman_cycid, CALLOUT_MPSAFE); + callout_init(&spa->spa_deadman_cycid, 1); #endif #endif refcount_create(&spa->spa_refcount); |
