Date: Wed, 11 May 2016 22:07:05 +0000 (UTC) From: Eric van Gyzen <vangyzen@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r299486 - stable/9/sys/x86/acpica Message-ID: <201605112207.u4BM751w034835@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605112207.u4BM751w034835>