diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-03-09 10:28:15 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-03-09 10:28:17 -0500 |
| commit | 7d2d5362a2023f1f710d88f54cc46aa6b2910461 (patch) | |
| tree | 71c4b46cb4678ea1d9db37f6637c7f80950cdcf6 /usr/src/uts/common/os/cpu.c | |
| parent | a6033573eedd94118d2b9e65f45deca0bf4b42f7 (diff) | |
| parent | 29940bf8af05acccf7b0a08eec421d2c1db7d560 (diff) | |
| download | illumos-joyent-7d2d5362a2023f1f710d88f54cc46aa6b2910461.tar.gz | |
[illumos-gate merge]
commit 29940bf8af05acccf7b0a08eec421d2c1db7d560
13603 March 2021 hwdata update
13604 pci.ids make update should use https
commit 24ffd7b4991aba1983bd17ddf22f48fddd796956
13609 i86xpv needs to be more careful with ao_gendisp
commit 9f160f41aaee44e207fb709edec8d6493d3c4f2d
13565 umem should only have one text section
commit 6d14434bff9ecb720b0d5e27ee39f9ec442f837e
13600 Fix regression in ctftest-convert-no-dwarf
commit 5ed99ae722c542671009b80e3fb34623a2ee0a73
13602 cpuset funcs could be more const
Conflict:
usr/src/uts/common/sys/cpuvar.h
Diffstat (limited to 'usr/src/uts/common/os/cpu.c')
| -rw-r--r-- | usr/src/uts/common/os/cpu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/uts/common/os/cpu.c b/usr/src/uts/common/os/cpu.c index e53c75b64e..3d33cfa6fc 100644 --- a/usr/src/uts/common/os/cpu.c +++ b/usr/src/uts/common/os/cpu.c @@ -22,6 +22,7 @@ * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. * Copyright 2019 Joyent, Inc. + * Copyright 2021 Oxide Computer Company */ /* @@ -2909,7 +2910,7 @@ cpuset_atomic_xdel(cpuset_t *s, const uint_t cpu) } void -cpuset_or(cpuset_t *dst, cpuset_t *src) +cpuset_or(cpuset_t *dst, const cpuset_t *src) { for (int i = 0; i < CPUSET_WORDS; i++) { dst->cpub[i] |= src->cpub[i]; @@ -2917,7 +2918,7 @@ cpuset_or(cpuset_t *dst, cpuset_t *src) } void -cpuset_xor(cpuset_t *dst, cpuset_t *src) +cpuset_xor(cpuset_t *dst, const cpuset_t *src) { for (int i = 0; i < CPUSET_WORDS; i++) { dst->cpub[i] ^= src->cpub[i]; @@ -2925,7 +2926,7 @@ cpuset_xor(cpuset_t *dst, cpuset_t *src) } void -cpuset_and(cpuset_t *dst, cpuset_t *src) +cpuset_and(cpuset_t *dst, const cpuset_t *src) { for (int i = 0; i < CPUSET_WORDS; i++) { dst->cpub[i] &= src->cpub[i]; |