diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-07-01 13:27:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 13:27:16 -0400 |
| commit | 1fef3b89560b821bfc30ca13f87ed2c0d876ee17 (patch) | |
| tree | ac9d8ca9247cf806d445001c5f382ff4eb4d5ce3 /usr/src/uts/common/os | |
| parent | 0402a6962cad4cc9a83682bb49b6496264a913c3 (diff) | |
| download | illumos-joyent-release-20210701.tar.gz | |
OS-8288 Pull in 13902 and 13915 early (#370)release-20210701
Portions contributed by: Jerry Jelinek <gjelinek@gmail.com>
Diffstat (limited to 'usr/src/uts/common/os')
| -rw-r--r-- | usr/src/uts/common/os/kcpc.c | 5 | ||||
| -rw-r--r-- | usr/src/uts/common/os/schedctl.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/usr/src/uts/common/os/kcpc.c b/usr/src/uts/common/os/kcpc.c index 977d243400..33486aaff3 100644 --- a/usr/src/uts/common/os/kcpc.c +++ b/usr/src/uts/common/os/kcpc.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2021 Joyent, Inc. */ #include <sys/param.h> @@ -318,7 +319,7 @@ kcpc_bind_thread(kcpc_set_t *set, kthread_t *t, int *subcode) * Add a device context to the subject thread. */ installctx(t, ctx, kcpc_save, kcpc_restore, NULL, - kcpc_lwp_create, NULL, kcpc_free); + kcpc_lwp_create, NULL, kcpc_free, NULL); /* * Ask the backend to program the hardware. @@ -1424,7 +1425,7 @@ kcpc_lwp_create(kthread_t *t, kthread_t *ct) } installctx(ct, cctx, kcpc_save, kcpc_restore, - NULL, kcpc_lwp_create, NULL, kcpc_free); + NULL, kcpc_lwp_create, NULL, kcpc_free, NULL); } /* diff --git a/usr/src/uts/common/os/schedctl.c b/usr/src/uts/common/os/schedctl.c index 18b396a765..34f72995a2 100644 --- a/usr/src/uts/common/os/schedctl.c +++ b/usr/src/uts/common/os/schedctl.c @@ -22,7 +22,7 @@ /* * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * Copyright 2016 Joyent, Inc. + * Copyright 2021 Joyent, Inc. */ #include <sys/types.h> @@ -113,7 +113,7 @@ schedctl(void) bzero(ssp, sizeof (*ssp)); installctx(t, ssp, schedctl_save, schedctl_restore, - schedctl_fork, NULL, NULL, NULL); + schedctl_fork, NULL, NULL, NULL, NULL); thread_lock(t); /* protect against ts_tick and ts_update */ t->t_schedctl = ssp; |