Author: vangyzen
Date: Wed May 11 22:07:05 2016
New Revision: 299486
URL: https://svnweb.freebsd.org/changeset/base/299486
Log:
MFC r299004: Work around (ignore) broken SRAT tables
Modified:
stable/9/sys/x86/acpica/srat.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/x86/acpica/srat.c
==============================================================================
--- stable/9/sys/x86/acpica/srat.c Wed May 11 22:06:28 2016
(r299485)
+++ stable/9/sys/x86/acpica/srat.c Wed May 11 22:07:05 2016
(r299486)
@@ -104,8 +104,12 @@ srat_parse_entry(ACPI_SUBTABLE_HEADER *e
"enabled" : "disabled");
if (!(cpu->Flags & ACPI_SRAT_CPU_ENABLED))
break;
- KASSERT(!cpus[cpu->ApicId].enabled,
- ("Duplicate local APIC ID %u", cpu->ApicId));
+ if (cpus[cpu->ApicId].enabled) {
+ printf("SRAT: Duplicate local APIC ID %u\n",
+ cpu->ApicId);
+ *(int *)arg = ENXIO;
+ break;
+ }
cpus[cpu->ApicId].domain = domain;
cpus[cpu->ApicId].enabled = 1;
break;
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
