From owner-cvs-src@FreeBSD.ORG  Wed Dec  3 19:53:21 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1914C16A4CF
	for <cvs-src@FreeBSD.org>; Wed,  3 Dec 2003 19:53:21 -0800 (PST)
Received: from rootlabs.com (root.org [67.118.192.226])
	by mx1.FreeBSD.org (Postfix) with SMTP id A4BCF43FDF
	for <cvs-src@FreeBSD.org>; Wed,  3 Dec 2003 19:53:18 -0800 (PST)
	(envelope-from nate@rootlabs.com)
Received: (qmail 21978 invoked by uid 1000); 4 Dec 2003 03:53:20 -0000
Date: Wed, 3 Dec 2003 19:53:20 -0800 (PST)
From: Nate Lawson <nate@root.org>
To: John Baldwin <jhb@FreeBSD.org>
In-Reply-To: <20031203203354.3F20D16A4F3@hub.freebsd.org>
Message-ID: <20031203195217.D21901@root.org>
References: <20031203203354.3F20D16A4F3@hub.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
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-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Dec 2003 03:53:21 -0000

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?

-Nate