From d944c4591196404254b3a6df02898174c228e231 Mon Sep 17 00:00:00 2001
From: marcel <marcel@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Wed, 2 Jul 2014 21:53:34 +0000
Subject: [PATCH] MFC 257475: Respect the kern.smp.disabled tunable.

git-svn-id: svn://svn.freebsd.org/base/stable/10@268181 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/ia64/ia64/mp_machdep.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c
index 4d41dbb62..e0a082b71 100644
--- a/sys/ia64/ia64/mp_machdep.c
+++ b/sys/ia64/ia64/mp_machdep.c
@@ -65,6 +65,8 @@ __FBSDID("$FreeBSD$");
 
 extern uint64_t bdata[];
 
+extern int smp_disabled;
+
 MALLOC_DEFINE(M_SMP, "SMP", "SMP related allocations");
 
 void ia64_ap_startup(void);
@@ -292,6 +294,9 @@ cpu_mp_add(u_int acpi_id, u_int id, u_int eid)
 	void *dpcpu;
 	u_int cpuid, sapic_id;
 
+	if (smp_disabled)
+		return;
+
 	sapic_id = SAPIC_ID_SET(id, eid);
 	cpuid = (IA64_LID_GET_SAPIC_ID(ia64_get_lid()) == sapic_id)
 	    ? 0 : smp_cpus++;
-- 
2.45.0