svn commit: r361352 - in head/sys: amd64/amd64 i386/i386

[Konstantin Belousov]

On Fri, May 22, 2020 at 01:18:55AM +0000, Mark Johnston wrote:
> Author: markj
> Date: Fri May 22 01:18:55 2020
> New Revision: 361352
> URL: https://svnweb.freebsd.org/changeset/base/361352
> 
> Log:
>   Fix the build after r361033 when ACPI is disabled.
What is the sense in doing this for amd64 ?  I doubt that we can boot
with ACPI disabled.

>   
>   Reported by:	Herbert J. Skuhra <herbert at gojira.at>
> 
> Modified:
>   head/sys/amd64/amd64/mp_machdep.c
>   head/sys/i386/i386/mp_machdep.c
> 
> Modified: head/sys/amd64/amd64/mp_machdep.c
> ==============================================================================
> --- head/sys/amd64/amd64/mp_machdep.c	Fri May 22 00:00:55 2020	(r361351)
> +++ head/sys/amd64/amd64/mp_machdep.c	Fri May 22 01:18:55 2020	(r361352)
> @@ -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)
> @@ -265,7 +268,9 @@ cpu_mp_start(void)
>  
>  	set_interrupt_apic_ids();
>  
> +#if defined(DEV_ACPI) && MAXMEMDOM > 1
>  	acpi_pxm_set_cpu_locality();
> +#endif
>  }
>  
>  /*
> 
> Modified: head/sys/i386/i386/mp_machdep.c
> ==============================================================================
> --- head/sys/i386/i386/mp_machdep.c	Fri May 22 00:00:55 2020	(r361351)
> +++ head/sys/i386/i386/mp_machdep.c	Fri May 22 01:18:55 2020	(r361352)
> @@ -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)
> @@ -202,7 +205,7 @@ cpu_mp_start(void)
>  
>  	set_interrupt_apic_ids();
>  
> -#if MAXMEMDOM > 1
> +#if defined(DEV_ACPI) && MAXMEMDOM > 1
>  	acpi_pxm_set_cpu_locality();
>  #endif
>  }