diff options
| author | Robert Mustacchi <rm@fingolfin.org> | 2020-09-27 12:40:33 -0700 |
|---|---|---|
| committer | Robert Mustacchi <rm@fingolfin.org> | 2020-11-02 08:22:45 -0800 |
| commit | c4b98ceff2f78fc5bb2f6bbe2e76627f04ef66f5 (patch) | |
| tree | 8bdd9fe30a3a8cc59972a096c4e901b871e07a65 /usr/src/uts | |
| parent | 06524cf4e4f6c18e557fb244d42a8e47dba3b1b6 (diff) | |
| download | illumos-joyent-c4b98ceff2f78fc5bb2f6bbe2e76627f04ef66f5.tar.gz | |
13237 Plumb through PCID on AMD
Reviewed by: Patrick Mooney <pmooney@pfmooney.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/uts')
| -rw-r--r-- | usr/src/uts/i86pc/os/cpuid.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/usr/src/uts/i86pc/os/cpuid.c b/usr/src/uts/i86pc/os/cpuid.c index c1c8d93af5..c9bf5f18d5 100644 --- a/usr/src/uts/i86pc/os/cpuid.c +++ b/usr/src/uts/i86pc/os/cpuid.c @@ -3622,10 +3622,10 @@ cpuid_pass1(cpu_t *cpu, uchar_t *featureset) if (ecp->cp_ebx & CPUID_INTC_EBX_7_0_CLFLUSHOPT) add_x86_feature(featureset, X86FSET_CLFLUSHOPT); - if (cpi->cpi_vendor == X86_VENDOR_Intel) { - if (ecp->cp_ebx & CPUID_INTC_EBX_7_0_INVPCID) - add_x86_feature(featureset, X86FSET_INVPCID); + if (ecp->cp_ebx & CPUID_INTC_EBX_7_0_INVPCID) + add_x86_feature(featureset, X86FSET_INVPCID); + if (cpi->cpi_vendor == X86_VENDOR_Intel) { if (ecp->cp_ebx & CPUID_INTC_EBX_7_0_MPX) add_x86_feature(featureset, X86FSET_MPX); @@ -3820,10 +3820,8 @@ cpuid_pass1(cpu_t *cpu, uchar_t *featureset) } } - if (cpi->cpi_vendor == X86_VENDOR_Intel) { - if (cp->cp_ecx & CPUID_INTC_ECX_PCID) { - add_x86_feature(featureset, X86FSET_PCID); - } + if (cp->cp_ecx & CPUID_INTC_ECX_PCID) { + add_x86_feature(featureset, X86FSET_PCID); } if (cp->cp_ecx & CPUID_INTC_ECX_X2APIC) { |