diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-13 12:53:46 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-13 12:53:46 +0000 |
| commit | c767c5a53dc0ab8ce9e92ab7599f7f3740819bfc (patch) | |
| tree | d3d03d6f2f52aa3b546f7e2808d07921d09afe9e /usr/src/uts/i86pc/os/cpuid.c | |
| parent | 8585938b68c417dc081eba6fd4434484bb46dfe4 (diff) | |
| parent | 36f5a109a7ea7c74a4d90af4f589df489e7537c0 (diff) | |
| download | illumos-joyent-release-20190314.tar.gz | |
[illumos-gate merge]release-20190314
commit 0b427924a934b5ebe2ecd53ed66d8e65892da75e
10145 smbios_info_boot() gets NULL check wrong
commit 464615a7e8b4d2de999abe2a1bd78b4be78efc0a
10497 loader: bootstrap.h cstyle cleanup
commit cb0ea096588eb33ca26ea8853cda93b3372af2c7
10482 loader: console.c cstyle cleanup
commit 6e4a33937f4aeff3a5b207e49607138445d66674
10498 loader: comconsole cstyle cleanup
Conflicts:
usr/src/uts/i86pc/os/cpuid.c
Diffstat (limited to 'usr/src/uts/i86pc/os/cpuid.c')
| -rw-r--r-- | usr/src/uts/i86pc/os/cpuid.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/usr/src/uts/i86pc/os/cpuid.c b/usr/src/uts/i86pc/os/cpuid.c index 96d00a5f8a..cf4ee31df7 100644 --- a/usr/src/uts/i86pc/os/cpuid.c +++ b/usr/src/uts/i86pc/os/cpuid.c @@ -821,20 +821,20 @@ * * cpi_ncore_bits * - * This indicates the number of bits that are required to represent all of - * the cores in the system. As cores are derived based on their APIC IDs, - * we aren't guaranteed a run of APIC IDs starting from zero. It's OK for - * this value to be larger than the actual number of IDs that are present - * in the system. This is used to size tables by the CMI framework. It is - * only filled in for Intel and AMD CPUs. + * This indicates the number of bits that are required to represent all of + * the cores in the system. As cores are derived based on their APIC IDs, + * we aren't guaranteed a run of APIC IDs starting from zero. It's OK for + * this value to be larger than the actual number of IDs that are present + * in the system. This is used to size tables by the CMI framework. It is + * only filled in for Intel and AMD CPUs. * * cpi_nthread_bits * - * This indicates the number of bits required to represent all of the IDs - * that cover the logical CPUs that exist on a given core. It's OK for this - * value to be larger than the actual number of IDs that are present in the - * system. This is used to size tables by the CMI framework. It is - * only filled in for Intel and AMD CPUs. + * This indicates the number of bits required to represent all of the IDs + * that cover the logical CPUs that exist on a given core. It's OK for this + * value to be larger than the actual number of IDs that are present in the + * system. This is used to size tables by the CMI framework. It is + * only filled in for Intel and AMD CPUs. * * ----------- * Hypervisors |