Re: Re[2]: [PATCH] ACPICA 20051021 import

On Friday 28 October 2005 02:19 am, dawnshade wrote:
> -----Original Message-----
> From: Jung-uk Kim <jkim_at_FreeBSD.org>
> To: freebsd-acpi_at_FreeBSD.org
> Date: Thu, 27 Oct 2005 19:34:16 -0400
> Subject: Re: [PATCH] ACPICA 20051021 import
>
> > As I promised earlier, here is the patch against RELENG_6:
> >
> > http://people.freebsd.org/~jkim/acpica-import-20051021-stable.dif
> >f.gz
> >
> > If you are running -CURRENT, the previous patch is the one for
> > you.
> >
> > > There are new files added in this release.  So, you need `-p'
> > > option when applying this patch.
> > >
> > > Please test and/or review.
> >
> > Please do the same.
>
> cvsupped now (10.00 MSK GMT+04) to RELENG_6
> failed to patch file: src/sys/dev/acpi_support/acpi_ppc.c (i have
> no this file at all).

Soryy, that was my local file.  Corrected.

> and compiler error was: 
> cc -O -pipe -march=pentium-m
> -I/usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica
> -DACPI_USE_LOCAL_CACHE -Werror -D_KERNEL -DKLD_MODULE -nostdinc -I-
>  -I/usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica
> -DHAVE_KERNEL_OPTION_HEADERS -include
> /usr/src/sys/i386/compile/35/opt_global.h -I. -I_at_ -I_at_/contrib/altq
> -I_at_/../include -finline-limit=8000 -fno-common 
> -I/usr/src/sys/i386/compile/35 -mno-align-long-strings
> -mpreferred-stack-boundary=2  -mno-mmx -mno-3dnow -mno-sse
> -mno-sse2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs
> -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline
> -Wcast-qual  -fformat-extensions -std=c99 -Wsystem-headers -Werror
> -Wall -Wno-format-y2k -Wno-uninitialized -c
> /usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica/psloop.c
> /usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica/psloop.c
>:1062: error: redefinition of 'AcpiGbl_Depth'
--- >8 --- SNIP!!! --- >8 ---

This means that you have applied the patch twice or more.  You will 
have to clean up your tree and re-apply the patch.  FYI, these files 
have to be removed before apply the patch again:

src/sys/contrib/dev/acpica/acnames.h
src/sys/contrib/dev/acpica/acopcode.h
src/sys/contrib/dev/acpica/aecommon.h
src/sys/contrib/dev/acpica/aeexec.c
src/sys/contrib/dev/acpica/psloop.c
src/sys/contrib/dev/acpica/rsinfo.c
src/sys/contrib/dev/acpica/utcache.c
src/sys/contrib/dev/acpica/utmutex.c
src/sys/contrib/dev/acpica/utstate.c
src/sys/contrib/dev/acpica/compiler/asldefine.h

Thanks,

Jung-uk Kim