Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 May 2020 15:29:03 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r361335 - stable/12/sys/i386/i386
Message-ID:  <202005211529.04LFT3De068513@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: markj
Date: Thu May 21 15:29:03 2020
New Revision: 361335
URL: https://svnweb.freebsd.org/changeset/base/361335

Log:
  MFC r361039:
  Fix the i386 build after r361033.

Modified:
  stable/12/sys/i386/i386/mp_machdep.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/i386/i386/mp_machdep.c
==============================================================================
--- stable/12/sys/i386/i386/mp_machdep.c	Thu May 21 15:28:35 2020	(r361334)
+++ stable/12/sys/i386/i386/mp_machdep.c	Thu May 21 15:29:03 2020	(r361335)
@@ -83,6 +83,9 @@ __FBSDID("$FreeBSD$");
 #include <machine/specialreg.h>
 #include <x86/ucode.h>
 
+#include <contrib/dev/acpica/include/acpi.h>
+#include <dev/acpica/acpivar.h>
+
 #define WARMBOOT_TARGET		0
 #define WARMBOOT_OFF		(PMAP_MAP_LOW + 0x0467)
 #define WARMBOOT_SEG		(PMAP_MAP_LOW + 0x0469)
@@ -200,7 +203,9 @@ cpu_mp_start(void)
 
 	set_interrupt_apic_ids();
 
+#if MAXMEMDOM > 1
 	acpi_pxm_set_cpu_locality();
+#endif
 }
 
 /*



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005211529.04LFT3De068513>