svn commit: r361334 - in stable/12/sys: amd64/amd64 arm64/arm64 dev/acpica i386/i386 x86/acpica

[Mark Johnston]

On Fri, May 22, 2020 at 12:45:03AM +0200, Herbert J. Skuhra wrote:
> On Thu, 21 May 2020 17:28:35 +0200, Mark Johnston wrote:
> > 
> > Author: markj
> > Date: Thu May 21 15:28:35 2020
> > New Revision: 361334
> > URL: https://svnweb.freebsd.org/changeset/base/361334
> > 
> > Log:
> >   MFC r361033:
> >   Call acpi_pxm_set_proximity_info() slightly earlier on x86.
> > 
> > Modified:
> >   stable/12/sys/amd64/amd64/mp_machdep.c
> >   stable/12/sys/arm64/arm64/mp_machdep.c
> >   stable/12/sys/dev/acpica/acpi_pxm.c
> >   stable/12/sys/dev/acpica/acpivar.h
> >   stable/12/sys/i386/i386/mp_machdep.c
> >   stable/12/sys/x86/acpica/srat.c
> > Directory Properties:
> >   stable/12/   (props changed)
> > 
> > Modified: stable/12/sys/amd64/amd64/mp_machdep.c
> > ==============================================================================
> > --- stable/12/sys/amd64/amd64/mp_machdep.c	Thu May 21 15:18:59 2020	(r361333)
> > +++ stable/12/sys/amd64/amd64/mp_machdep.c	Thu May 21 15:28:35 2020	(r361334)
> > @@ -265,8 +265,9 @@ cpu_mp_start(void)
> >  	init_ops.start_all_aps();
> >  
> >  	set_interrupt_apic_ids();
> > -}
> >  
> > +	acpi_pxm_set_cpu_locality();
> > +}
> >  
> >  /*
> >   * AP CPU's call this to initialize themselves.
> 
> Until now it was possible to build a kernel (amd64) without 'device
> acpi'. After this commit it fails with this error:
> 
> --- kernel.full ---
> linking kernel.full
> ld: error: undefined symbol: acpi_pxm_set_cpu_locality
> >>> referenced by mp_machdep.c:269 (/usr/src/sys/amd64/amd64/mp_machdep.c:269)
> >>>               mp_machdep.o:(cpu_mp_start)
> *** [kernel.full] Error code 1
> 
> Was that intended?

It was unintentional.  I committed a fix to head in r361352 and will
merge to stable/12 shortly.