From owner-freebsd-current@FreeBSD.ORG Fri Oct 28 06:19:12 2005 Return-Path: X-Original-To: freebsd-current@FreeBSD.org Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 30F9516A41F; Fri, 28 Oct 2005 06:19:12 +0000 (GMT) (envelope-from h-k@mail.ru) Received: from f22.mail.ru (f22.mail.ru [194.67.57.55]) by mx1.FreeBSD.org (Postfix) with ESMTP id A24FA43D4C; Fri, 28 Oct 2005 06:19:11 +0000 (GMT) (envelope-from h-k@mail.ru) Received: from mail by f22.mail.ru with local id 1EVNa2-0002OD-00; Fri, 28 Oct 2005 10:19:10 +0400 Received: from [212.5.80.7] by win.mail.ru with HTTP; Fri, 28 Oct 2005 10:19:10 +0400 From: dawnshade To: Jung-uk Kim Mime-Version: 1.0 X-Mailer: mPOP Web-Mail 2.19 X-Originating-IP: unknown via proxy [212.5.80.7] Date: Fri, 28 Oct 2005 10:19:10 +0400 In-Reply-To: <200510271934.19827.jkim@FreeBSD.org> Content-Type: text/plain; charset=windows-1251 Content-Transfer-Encoding: 8bit Message-Id: X-Mailman-Approved-At: Fri, 28 Oct 2005 13:17:16 +0000 Cc: freebsd-acpi@FreeBSD.org, freebsd-current@FreeBSD.org Subject: Re[2]: [PATCH] ACPICA 20051021 import X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: dawnshade List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2005 06:19:12 -0000 -----Original Message----- From: Jung-uk Kim To: freebsd-acpi@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.