From owner-cvs-all@FreeBSD.ORG Thu Dec 4 10:17:27 2003 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 018FE16A4D0 for ; Thu, 4 Dec 2003 10:17:27 -0800 (PST) Received: from mail3.speakeasy.net (mail3.speakeasy.net [216.254.0.203]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8C7143FE1 for ; Thu, 4 Dec 2003 10:17:21 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 20075 invoked from network); 4 Dec 2003 18:17:21 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 4 Dec 2003 18:17:21 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.9/8.12.9) with ESMTP id hB4IHIFn015411; Thu, 4 Dec 2003 13:17:18 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20031203195217.D21901@root.org> Date: Thu, 04 Dec 2003 13:17:25 -0500 (EST) From: John Baldwin To: Nate Lawson X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/i386/acpica madt.c src/sys/i386/i386 local_apic.c mptable.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Dec 2003 18:17:27 -0000 On 04-Dec-2003 Nate Lawson wrote: > On Wed, 3 Dec 2003, John Baldwin wrote: >> - Allow the apic device to be disabled via 'hint.apic.0.disabled' from the >> loader. Note that since this is done in the local APIC code, it works >> for both the ACPI and non-ACPI cases. >> >> Approved by: re (scott / blanket) >> >> Revision Changes Path >> 1.8 +2 -3 src/sys/i386/acpica/madt.c >> 1.4 +16 -24 src/sys/i386/i386/local_apic.c >> 1.228 +2 -2 src/sys/i386/i386/mptable.c >> >> static void >> apic_init(void *dummy __unused) >> { >> struct apic_enumerator *enumerator; >> + uint64_t apic_base; >> int retval, best; >> >> /* We only support built in local APICs. */ >> if (!(cpu_feature & CPUID_APIC)) >> return; >> >> + /* Don't probe if APIC mode is disabled. */ >> + if (resource_disabled("apic", 0)) >> + return; >> + > > Isn't the code that Peter just committed to amd64 redundant with this? His code only works for the ACPI case and doesn't handle the MP Table case. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/