diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-24 11:59:07 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-24 11:59:07 +0000 |
| commit | 269407a4d5b375a0218804f9e208d722257c2bb0 (patch) | |
| tree | e87c071ad4fb0fa6fc10e8d3919a17b9f2fcefae /usr/src/uts/common/exec | |
| parent | df19b64eb529388a60a4bb9c4e384505e04fad49 (diff) | |
| parent | 1dd4766bd0d7ab56961ce97c9c39de612ae2e7d1 (diff) | |
| download | illumos-joyent-269407a4d5b375a0218804f9e208d722257c2bb0.tar.gz | |
[illumos-gate merge]
commit 1dd4766bd0d7ab56961ce97c9c39de612ae2e7d1
12153 netstat can use /proc/<PID>/fdinfo and avoid grabbing processes
commit a02120c4550735e4c33259ff2671a5ef9d06c5cc
12046 Provide /proc/<PID>/fdinfo/
commit e3bf7d5a53699b06ef4e776789b585322c4bf8ed
12189 zfs test suite calculates md5 digests suboptimally
Conflicts:
usr/src/uts/common/sys/prsystm.h
usr/src/uts/common/fs/proc/prvnops.c
Diffstat (limited to 'usr/src/uts/common/exec')
| -rw-r--r-- | usr/src/uts/common/exec/elf/elf_notes.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/uts/common/exec/elf/elf_notes.c b/usr/src/uts/common/exec/elf/elf_notes.c index 6a024d0d1f..06f9ceb633 100644 --- a/usr/src/uts/common/exec/elf/elf_notes.c +++ b/usr/src/uts/common/exec/elf/elf_notes.c @@ -27,6 +27,7 @@ /* * Copyright 2012 DEY Storage Systems, Inc. All rights reserved. * Copyright 2018 Joyent, Inc. + * Copyright 2020 OmniOS Community Edition (OmniOSce) Association. */ #include <sys/types.h> @@ -108,7 +109,7 @@ setup_note_header(Phdr *v, proc_t *p) + (nlwp + nzomb) * roundup(sizeof (lwpsinfo_t), sizeof (Word)) + nlwp * roundup(sizeof (lwpstatus_t), sizeof (Word)) + nlwp * roundup(sizeof (prlwpname_t), sizeof (Word)) - + nfd * roundup(sizeof (prfdinfo_t), sizeof (Word)); + + nfd * roundup(sizeof (prfdinfo_core_t), sizeof (Word)); if (curproc->p_agenttp != NULL) { v[0].p_filesz += sizeof (Note) + @@ -352,7 +353,7 @@ write_elfnotes(proc_t *p, int sig, vnode_t *vp, offset_t offset, vnode_t *fvp; struct file *fp; vattr_t vattr; - prfdinfo_t fdinfo; + prfdinfo_core_t fdinfo; bzero(&fdinfo, sizeof (fdinfo)); |