diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-29 12:39:14 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-29 12:39:14 +0000 |
| commit | ba00eaee16f1630c60ffe70da9623a6b24300d1b (patch) | |
| tree | c377993e7776a01519acc8aaa0f703f0cc7b27e9 /usr/src/uts/intel/sys | |
| parent | ee930d2f04dcbdb046103cf48945c9e0643f47d7 (diff) | |
| parent | cebe54d9b6803d3cfa3b14a553098ba7da2fc624 (diff) | |
| download | illumos-joyent-ba00eaee16f1630c60ffe70da9623a6b24300d1b.tar.gz | |
[illumos-gate merge]
commit cebe54d9b6803d3cfa3b14a553098ba7da2fc624
12253 mib2.h: error: field 'tcp6ConnEntryInfo' has incomplete type 'tcpConnEntryInfo_s'
commit 2e6e9b6b9da4e0f480e434e015ff8e9b82300ed1
12220 loader multi-console shouldn't override bootenv.rc
Conflicts:
usr/src/uts/common/inet/mib2.h
Diffstat (limited to 'usr/src/uts/intel/sys')
| -rw-r--r-- | usr/src/uts/intel/sys/bootconf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/intel/sys/bootconf.h b/usr/src/uts/intel/sys/bootconf.h index f0ade9d94d..311fd40e6f 100644 --- a/usr/src/uts/intel/sys/bootconf.h +++ b/usr/src/uts/intel/sys/bootconf.h @@ -23,7 +23,7 @@ * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * Copyright 2016 Nexenta Systems, Inc. - * Copyright 2019, Joyent, Inc. + * Copyright 2020 Joyent, Inc. */ #ifndef _SYS_BOOTCONF_H @@ -243,7 +243,7 @@ extern void bop_panic(const char *, ...) __KPRINTFLIKE(1) __NORETURN; #pragma rarely_called(bop_panic) -extern void boot_prop_finish(void); +extern void read_bootenvrc(void); extern int bootprop_getval(const char *, u_longlong_t *); extern int bootprop_getstr(const char *, char *, size_t); |