From owner-svn-src-all@freebsd.org Fri May 22 15:11:14 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1F5082CB35F; Fri, 22 May 2020 15:11:14 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49T91F4t9Nz4QSl; Fri, 22 May 2020 15:11:13 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id 04MFAxtE077205 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 22 May 2020 18:11:02 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 04MFAxtE077205 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id 04MFAx27077204; Fri, 22 May 2020 18:10:59 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 22 May 2020 18:10:59 +0300 From: Konstantin Belousov To: Mark Johnston Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361352 - in head/sys: amd64/amd64 i386/i386 Message-ID: <20200522151059.GK64045@kib.kiev.ua> References: <202005220118.04M1ItwO032876@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202005220118.04M1ItwO032876@repo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on tom.home X-Rspamd-Queue-Id: 49T91F4t9Nz4QSl X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 May 2020 15:11:14 -0000 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 > > 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 > __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 > #include > > +#ifdef DEV_ACPI > #include > #include > +#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 > __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 > #include > > +#ifdef DEV_ACPI > #include > #include > +#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 > }