cvs commit: src/sys/contrib/dev/acpica acconfig.h acenv.hdbxface.cutglobal.c

[Nate Lawson]

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