Author: markj
Date: Fri May 22 15:42:45 2020
New Revision: 361386
URL: https://svnweb.freebsd.org/changeset/base/361386
Log:
MFC r361352:
Fix the build after r361033 when ACPI is disabled.
Modified:
stable/12/sys/amd64/amd64/mp_machdep.c
stable/12/sys/i386/i386/mp_machdep.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- stable/12/sys/amd64/amd64/mp_machdep.c Fri May 22 15:30:14 2020
(r361385)
+++ stable/12/sys/amd64/amd64/mp_machdep.c Fri May 22 15:42:45 2020
(r361386)
@@ -29,6 +29,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_acpi.h"
#include "opt_cpu.h"
#include "opt_ddb.h"
#include "opt_kstack_pages.h"
@@ -78,8 +79,10 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <x86/init.h>
+#ifdef DEV_ACPI
#include <contrib/dev/acpica/include/acpi.h>
#include <dev/acpica/acpivar.h>
+#endif
#define WARMBOOT_TARGET 0
#define WARMBOOT_OFF (KERNBASE + 0x0467)
@@ -266,7 +269,9 @@ cpu_mp_start(void)
set_interrupt_apic_ids();
+#if defined(DEV_ACPI) && MAXMEMDOM > 1
acpi_pxm_set_cpu_locality();
+#endif
}
/*
Modified: stable/12/sys/i386/i386/mp_machdep.c
==============================================================================
--- stable/12/sys/i386/i386/mp_machdep.c Fri May 22 15:30:14 2020
(r361385)
+++ stable/12/sys/i386/i386/mp_machdep.c Fri May 22 15:42:45 2020
(r361386)
@@ -28,6 +28,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_acpi.h"
#include "opt_apic.h"
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
@@ -83,8 +84,10 @@ __FBSDID("$FreeBSD$");
#include <machine/specialreg.h>
#include <x86/ucode.h>
+#ifdef DEV_ACPI
#include <contrib/dev/acpica/include/acpi.h>
#include <dev/acpica/acpivar.h>
+#endif
#define WARMBOOT_TARGET 0
#define WARMBOOT_OFF (PMAP_MAP_LOW + 0x0467)
@@ -203,7 +206,7 @@ cpu_mp_start(void)
set_interrupt_apic_ids();
-#if MAXMEMDOM > 1
+#if defined(DEV_ACPI) && MAXMEMDOM > 1
acpi_pxm_set_cpu_locality();
#endif
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
