From owner-cvs-all@FreeBSD.ORG  Thu May  1 12:04:47 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
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 DEEE037B405
	for <cvs-all@FreeBSD.org>; Thu,  1 May 2003 12:04:47 -0700 (PDT)
Received: from rootlabs.com (root.org [67.118.192.226])
	by mx1.FreeBSD.org (Postfix) with SMTP id AA77A43FE1
	for <cvs-all@FreeBSD.org>; Thu,  1 May 2003 12:04:45 -0700 (PDT)
	(envelope-from nate@rootlabs.com)
Received: (qmail 86722 invoked by uid 1000); 1 May 2003 19:04:46 -0000
Date: Thu, 1 May 2003 12:04:46 -0700 (PDT)
From: Nate Lawson <nate@root.org>
To: John Baldwin <jhb@FreeBSD.org>
In-Reply-To: <XFMail.20030501143516.jhb@FreeBSD.org>
Message-ID: <Pine.BSF.4.21.0305011203500.86597-100000@root.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: cvs-src@FreeBSD.org
cc: Nate Lawson <njl@FreeBSD.org>
cc: src-committers@FreeBSD.org
cc: cvs-all@FreeBSD.org
Subject: RE: cvs commit: src/sys/contrib/dev/acpica acconfig.h
	acenv.hdbxface.cutglobal.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 May 2003 19:04:48 -0000

On Thu, 1 May 2003, John Baldwin wrote:
> On 29-Apr-2003 Nate Lawson wrote:
> >   Log:
> >   Resolve conflicts.
> >   
> >   Revision  Changes    Path
> >   1.5       +5 -7      src/sys/contrib/dev/acpica/acenv.h
> 
> This hunk looks bogus as it didn't change during the Intel import:
> 
> @@ -260,14 +260,12 @@
>  #define DEBUGGER_SINGLE_THREADED    0
>  #define DEBUGGER_MULTI_THREADED     1
>  
> -#ifndef DEBUGGER_THREADING
>  #ifdef ACPI_APPLICATION
>  #define DEBUGGER_THREADING          DEBUGGER_SINGLE_THREADED
>  
>  #else
>  #define DEBUGGER_THREADING          DEBUGGER_MULTI_THREADED
>  #endif
> -#endif
>  
>  
>  /******************************************************************************
> 
> Without this change make kernel-depend of LINT gives a _lot_ of
> warnings.  LINT also doesn't compile, but this is at least a
> good first step.

Thanks.  I was testing some changes that creeped into the local
file.  I'll fix that and some debugging printfs later tonight.

-Nate