diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-28 12:25:20 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-28 12:25:20 +0000 |
| commit | e06b654e6a426c9ed9bfaf64b7660be0a8264664 (patch) | |
| tree | cebe6db0b1be3caf9d8dbc478be64054bdcf1589 | |
| parent | faeaa26e163d52687050158b42d206b04398000f (diff) | |
| parent | 2c2b5e89f6b9617f543c1b581759525f4730690e (diff) | |
| download | illumos-joyent-e06b654e6a426c9ed9bfaf64b7660be0a8264664.tar.gz | |
[illumos-gate merge]
commit 2c2b5e89f6b9617f543c1b581759525f4730690e
11275 gettimeofday should use comm page
Conflicts:
usr/src/lib/libc/i386/sys/gettimeofday.c
| -rw-r--r-- | usr/src/lib/libc/amd64/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/libc/i386/sys/gettimeofday.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile index dfd4069e85..c0a065c9df 100644 --- a/usr/src/lib/libc/amd64/Makefile +++ b/usr/src/lib/libc/amd64/Makefile @@ -24,7 +24,7 @@ # Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved. # Copyright 2013 Garrett D'Amore <garrett@damore.org> # Copyright 2018 Nexenta Systems, Inc. -# Copyright (c) 2019, Joyent, Inc. +# Copyright 2019 Joyent, Inc. # Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # diff --git a/usr/src/lib/libc/i386/sys/gettimeofday.c b/usr/src/lib/libc/i386/sys/gettimeofday.c index 7539c2143e..c2396e582a 100644 --- a/usr/src/lib/libc/i386/sys/gettimeofday.c +++ b/usr/src/lib/libc/i386/sys/gettimeofday.c @@ -28,7 +28,7 @@ gettimeofday(struct timeval *tv, void *tz) /* * Perform a NULL check before attempting to store the result directly. - * The old fasttrop logic would perform this same check, but after the + * The old fasttrap logic would perform this same check, but after the * call into hrestime(). */ if (tv == NULL) { |