diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-15 13:04:31 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-15 13:04:31 +0000 |
| commit | 7a34fde236609b18147eb73e6a163e19162d96e2 (patch) | |
| tree | 11d647767f5036bbcccee110ad13891ed603a972 /usr/src/uts/common/krtld/kobj.c | |
| parent | 0de99a4637b946f1cd1c7d9fb5949112e1afb82f (diff) | |
| parent | c653bb4713ca694c2d16b04b65d5b76c0bb46bd4 (diff) | |
| download | illumos-joyent-7a34fde236609b18147eb73e6a163e19162d96e2.tar.gz | |
[illumos-gate merge]
commit c653bb4713ca694c2d16b04b65d5b76c0bb46bd4
10197 build smatch in parallel
commit 15c07adc1c7b828006b5e3c4d528b92229d6bd23
10081 smatch indenting fixes for usr/src/uts
commit 5661bb7641e85c46713da7a3002b29ecd2c3daf0
10080 smatch Makefile changes for usr/src/cmd
commit 05ede3db5e3b7d540afbccdc872c735770e82ef3
10079 smatch Makefile changes for usr/src/lib
commit cadd68ea0014761eda6a293664086dfa80686d85
10078 smatch fixes for UCB
commit 1ea94c756c0bc9170021d7b570944a24f224c03f
10202 loader: use screen-#rows to find bottom left co-ordinates
commit 08487eea68a2fa501b5042131c6db068089f82e1
10173 loader: support newer ZFS versions
Conflicts:
usr/src/lib/libdladm/Makefile.com
usr/src/lib/fm/topo/modules/i86pc/chip/Makefile
Diffstat (limited to 'usr/src/uts/common/krtld/kobj.c')
| -rw-r--r-- | usr/src/uts/common/krtld/kobj.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/usr/src/uts/common/krtld/kobj.c b/usr/src/uts/common/krtld/kobj.c index 3391abd745..4f8997adfc 100644 --- a/usr/src/uts/common/krtld/kobj.c +++ b/usr/src/uts/common/krtld/kobj.c @@ -25,7 +25,7 @@ /* * Copyright 2011 Bayard G. Bell <buffer.g.overflow@gmail.com>. * All rights reserved. Use is subject to license terms. - * Copyright (c) 2017 Joyent, Inc. + * Copyright (c) 2018, Joyent, Inc. */ /* @@ -3393,26 +3393,26 @@ sym_insert(struct module *mp, char *name, symid_t index) symid_t *ip; #ifdef KOBJ_DEBUG - if (kobj_debug & D_SYMBOLS) { - static struct module *lastmp = NULL; - Sym *sp; - if (lastmp != mp) { - _kobj_printf(ops, - "krtld: symbol entry: file=%s\n", - mp->filename); - _kobj_printf(ops, - "krtld:\tsymndx\tvalue\t\t" - "symbol name\n"); - lastmp = mp; - } - sp = (Sym *)(mp->symtbl + - index * mp->symhdr->sh_entsize); - _kobj_printf(ops, "krtld:\t[%3d]", index); - _kobj_printf(ops, "\t0x%lx", sp->st_value); - _kobj_printf(ops, "\t%s\n", name); + if (kobj_debug & D_SYMBOLS) { + static struct module *lastmp = NULL; + Sym *sp; + if (lastmp != mp) { + _kobj_printf(ops, + "krtld: symbol entry: file=%s\n", + mp->filename); + _kobj_printf(ops, + "krtld:\tsymndx\tvalue\t\t" + "symbol name\n"); + lastmp = mp; } - + sp = (Sym *)(mp->symtbl + + index * mp->symhdr->sh_entsize); + _kobj_printf(ops, "krtld:\t[%3d]", index); + _kobj_printf(ops, "\t0x%lx", sp->st_value); + _kobj_printf(ops, "\t%s\n", name); + } #endif + for (ip = &mp->buckets[kobj_hash_name(name) % mp->hashsize]; *ip; ip = &mp->chains[*ip]) { ; |