diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-12-07 12:47:12 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-12-07 12:47:12 +0000 |
| commit | a1b5b02d283a933de7f074a68398486a187f7e67 (patch) | |
| tree | e2b2b71ff380bf5663f7063501c0a991617e6d2a /usr/src/uts/common/sys/dumphdr.h | |
| parent | 7662705473b5736c9bcb3d7ace7cd1ae5c2f784d (diff) | |
| parent | fdff6cea3adcb1f377a673bc22c427ce25917f05 (diff) | |
| download | illumos-joyent-release-20161208.tar.gz | |
[illumos-gate merge]release-20161208
commit fdff6cea3adcb1f377a673bc22c427ce25917f05
7652 libficl build should depend on libuuid
commit 3f11de9ddb9e8b567df284c7f495ac53076611c4
7605 we should not attempt to write to ZFS while panicing
Diffstat (limited to 'usr/src/uts/common/sys/dumphdr.h')
| -rw-r--r-- | usr/src/uts/common/sys/dumphdr.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usr/src/uts/common/sys/dumphdr.h b/usr/src/uts/common/sys/dumphdr.h index e8603da399..f418913257 100644 --- a/usr/src/uts/common/sys/dumphdr.h +++ b/usr/src/uts/common/sys/dumphdr.h @@ -20,6 +20,7 @@ */ /* * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #ifndef _SYS_DUMPHDR_H @@ -178,8 +179,6 @@ extern char *dumppath; extern int dump_timeout; extern int dump_timeleft; extern int dump_ioerr; -extern int sync_timeout; -extern int sync_timeleft; extern int dumpinit(struct vnode *, char *, int); extern void dumpfini(void); |