diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-01-02 13:26:16 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-01-02 13:26:16 +0000 |
| commit | eaee8e7f897991edc0a5101cba7c850674437f27 (patch) | |
| tree | bfd59e4e2c6318db1695c07fe6b50570f2769174 | |
| parent | e62163e1b6bd7ea7c23ac23c3b73dba5ce0dfe98 (diff) | |
| parent | d55a46f954d8bac4f76475e10623992b4caaefc5 (diff) | |
| download | illumos-joyent-eaee8e7f897991edc0a5101cba7c850674437f27.tar.gz | |
[illumos-gate merge]
commit d55a46f954d8bac4f76475e10623992b4caaefc5
8934 ACPI 6.0 requires Processor Local X2APIC for all processors
commit 3aacd5d76d8003a9c919c9dbc00fe1f58b5570fe
8615 Driver alias "cxgbe" conflicts with an existing driver name or alias.
| -rw-r--r-- | usr/src/pkg/manifests/driver-network-cxgbe.mf | 1 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/io/mp_platform_common.c | 17 |
2 files changed, 0 insertions, 18 deletions
diff --git a/usr/src/pkg/manifests/driver-network-cxgbe.mf b/usr/src/pkg/manifests/driver-network-cxgbe.mf index da3df95d77..2e0cbffe54 100644 --- a/usr/src/pkg/manifests/driver-network-cxgbe.mf +++ b/usr/src/pkg/manifests/driver-network-cxgbe.mf @@ -87,7 +87,6 @@ driver name=t4nex clone_perms="t4nex 0666 root sys" \ alias=pciex1425,549a \ alias=pciex1425,549b \ alias=pciex1425,549c \ - alias=pciex1425,549c \ alias=pciex1425,549d \ alias=pciex1425,549e \ alias=pciex1425,549f \ diff --git a/usr/src/uts/i86pc/io/mp_platform_common.c b/usr/src/uts/i86pc/io/mp_platform_common.c index 7f06c46eaa..241171bd8e 100644 --- a/usr/src/uts/i86pc/io/mp_platform_common.c +++ b/usr/src/uts/i86pc/io/mp_platform_common.c @@ -762,23 +762,6 @@ acpi_probe(char *modname) case ACPI_MADT_TYPE_LOCAL_X2APIC: mpx2a = (ACPI_MADT_LOCAL_X2APIC *) ap; - /* - * All logical processors with APIC ID values - * of 255 and greater will have their APIC - * reported through Processor X2APIC structure. - * All logical processors with APIC ID less than - * 255 will have their APIC reported through - * Processor Local APIC. - * - * Some systems apparently don't care and report all - * processors through Processor X2APIC structures. We - * warn about that but don't ignore those CPUs. - */ - if (mpx2a->LocalApicId < 255) { - cmn_err(CE_WARN, "!%s: ignoring invalid entry " - "in MADT: CPU %d has X2APIC Id %d (< 255)", - psm_name, mpx2a->Uid, mpx2a->LocalApicId); - } if (mpx2a->LapicFlags & ACPI_MADT_ENABLED) { if (mpx2a->LocalApicId == local_ids[0]) { ASSERT(index == 1); |