[PATCH] ACPICA 20051021 import

[dawnshade]

-----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.diff.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).
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@ -I@/contrib/altq -I@/../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'
/usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica/psloop.c:135: error: previous definition of 'AcpiGbl_Depth' was here
/usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica/psloop.c:1081: error: redefinition of 'AcpiPsParseLoop'
/usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica/psloop.c:154: error: previous definition of 'AcpiPsParseLoop' was here
/usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica/psloop.c:1989: error: redefinition of 'AcpiGbl_Depth'
/usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica/psloop.c:1062: error: previous definition of 'AcpiGbl_Depth' was here
/usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica/psloop.c:1989: error: redefinition of 'AcpiGbl_Depth'
/usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica/psloop.c:1062: error: previous definition of 'AcpiGbl_Depth' was here
/usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica/psloop.c:2008: error: redefinition of 'AcpiPsParseLoop'
/usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica/psloop.c:1081: error: previous definition of 'AcpiPsParseLoop' was here
/usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica/psloop.c:2008: error: redefinition of 'AcpiPsParseLoop'
/usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica/psloop.c:1081: error: previous definition of 'AcpiPsParseLoop' was here
{standard input}: Assembler messages:
{standard input}:782: Error: symbol `AcpiGbl_Depth' is already defined
{standard input}:784: Error: symbol `AcpiGbl_Depth' is already defined
*** Error code 1

Stop in /usr/src/sys/modules/acpi/acpi.
*** Error code 1

Stop in /usr/src/sys/modules/acpi.
*** Error code 1

Stop in /usr/src/sys/modules.
*** Error code 1

Stop in /usr/src/sys/i386/compile/35.