svn commit: r268181 - stable/10/sys/ia64/ia64

[Marcel Moolenaar]

Author: marcel
Date: Wed Jul  2 21:53:34 2014
New Revision: 268181
URL: http://svnweb.freebsd.org/changeset/base/268181

Log:
  MFC 257475: Respect the kern.smp.disabled tunable.

Modified:
  stable/10/sys/ia64/ia64/mp_machdep.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/ia64/ia64/mp_machdep.c
==============================================================================
--- stable/10/sys/ia64/ia64/mp_machdep.c	Wed Jul  2 21:28:50 2014	(r268180)
+++ stable/10/sys/ia64/ia64/mp_machdep.c	Wed Jul  2 21:53:34 2014	(r268181)
@@ -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_in
 	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++;