diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-07-01 13:27:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 13:27:16 -0400 |
| commit | 1fef3b89560b821bfc30ca13f87ed2c0d876ee17 (patch) | |
| tree | ac9d8ca9247cf806d445001c5f382ff4eb4d5ce3 /usr/src/uts/common/fs/zfs | |
| parent | 0402a6962cad4cc9a83682bb49b6496264a913c3 (diff) | |
| download | illumos-joyent-release-20210701.tar.gz | |
OS-8288 Pull in 13902 and 13915 early (#370)release-20210701
Portions contributed by: Jerry Jelinek <gjelinek@gmail.com>
Diffstat (limited to 'usr/src/uts/common/fs/zfs')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/spa_misc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/uts/common/fs/zfs/spa_misc.c b/usr/src/uts/common/fs/zfs/spa_misc.c index dd44829a43..af87d4611c 100644 --- a/usr/src/uts/common/fs/zfs/spa_misc.c +++ b/usr/src/uts/common/fs/zfs/spa_misc.c @@ -322,7 +322,8 @@ int zfs_deadman_enabled = -1; * the FPU state? This is currently off by default due to stability issues in * the kernel FPU routines; e.g., see bug 13717. */ -int zfs_fpu_enabled = 0; +/* XXX SmartOS now includes fixes for 13902 and 13915, so re-enable it. */ +int zfs_fpu_enabled = 1; #endif /* |