From 5d1989c3a1667fde4261ffc00f741b6262a13e5a Mon Sep 17 00:00:00 2001
From: vangyzen <vangyzen@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Wed, 11 May 2016 22:06:28 +0000
Subject: [PATCH] MFC r299004: Work around (ignore) broken SRAT tables

git-svn-id: svn://svn.freebsd.org/base/stable/10@299485 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/x86/acpica/srat.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys/x86/acpica/srat.c b/sys/x86/acpica/srat.c
index 45f1c3d9d..952dce9aa 100644
--- a/sys/x86/acpica/srat.c
+++ b/sys/x86/acpica/srat.c
@@ -108,8 +108,12 @@ srat_parse_entry(ACPI_SUBTABLE_HEADER *entry, void *arg)
 			    "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;
-- 
2.45.0