diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-11-07 22:04:45 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-11-07 22:04:45 +0000 |
| commit | ad2a40e16d2bee59cfe84f89db3ce92b9f15adff (patch) | |
| tree | bc8e23c4588b29e4602a54b72dbe2f1d8786468d /usr/src/uts/sparc/zfs/spa_boot.c | |
| parent | b5f683274309a9c6f46eea8ce5d0cca514d977a8 (diff) | |
| parent | 7c45eec5760d4195b6b85770e7ac51c380adfb8a (diff) | |
| download | illumos-joyent-ad2a40e16d2bee59cfe84f89db3ce92b9f15adff.tar.gz | |
Illumos sync
Diffstat (limited to 'usr/src/uts/sparc/zfs/spa_boot.c')
| -rw-r--r-- | usr/src/uts/sparc/zfs/spa_boot.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/usr/src/uts/sparc/zfs/spa_boot.c b/usr/src/uts/sparc/zfs/spa_boot.c index 6f5f652f15..71a8b9ed51 100644 --- a/usr/src/uts/sparc/zfs/spa_boot.c +++ b/usr/src/uts/sparc/zfs/spa_boot.c @@ -24,10 +24,16 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ + #include <sys/zio.h> #include <sys/spa.h> #include <sys/bootconf.h> +extern int zfs_deadman_enabled; + char * spa_get_bootprop(char *propname) { @@ -52,3 +58,13 @@ spa_free_bootprop(char *propname) { kmem_free(propname, strlen(propname) + 1); } + +void +spa_arch_init(void) +{ + /* + * The deadman is disabled by default on sparc. + */ + if (zfs_deadman_enabled == -1) + zfs_deadman_enabled = 0; +} |