From owner-freebsd-current@FreeBSD.ORG Thu Jul 1 15:15:55 2004 Return-Path: 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 64E2B16A4CE; Thu, 1 Jul 2004 15:15:55 +0000 (GMT) Received: from smtp.des.no (flood.des.no [217.116.83.31]) by mx1.FreeBSD.org (Postfix) with ESMTP id 270E843D1D; Thu, 1 Jul 2004 15:15:55 +0000 (GMT) (envelope-from des@des.no) Received: by smtp.des.no (Pony Express, from userid 666) id AB23F5311; Thu, 1 Jul 2004 17:15:13 +0200 (CEST) Received: from dwp.des.no (des.no [80.203.228.37]) by smtp.des.no (Pony Express) with ESMTP id 250DC530A; Thu, 1 Jul 2004 17:15:01 +0200 (CEST) Received: by dwp.des.no (Postfix, from userid 2602) id 06327B860; Thu, 1 Jul 2004 17:15:01 +0200 (CEST) To: FreeBSD Tinderbox References: <20040701115954.805D27303F@freebsd-current.sentex.ca> From: des@des.no (=?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=) Date: Thu, 01 Jul 2004 17:15:00 +0200 In-Reply-To: <20040701115954.805D27303F@freebsd-current.sentex.ca> (FreeBSD Tinderbox's message of "Thu, 1 Jul 2004 07:59:54 -0400 (EDT)") Message-ID: User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on flood.des.no X-Spam-Level: X-Spam-Status: No, hits=0.0 required=5.0 tests=AWL autolearn=no version=2.63 cc: current@freebsd.org cc: i386@freebsd.org Subject: Re: [current tinderbox] failure on i386/i386 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 15:15:55 -0000 --=-=-= Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable FreeBSD Tinderbox writes: > /tinderbox/CURRENT/i386/i386/src/sys/dev/acpica/acpi_ec.c: In function `a= cpi_ec_ecdt_probe': > /tinderbox/CURRENT/i386/i386/src/sys/dev/acpica/acpi_ec.c:379: warning: d= ereferencing type-punned pointer will break strict-aliasing rules > *** Error code 1 Hack attached. DES --=20 Dag-Erling Sm=F8rgrav - des@des.no --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=acpica.diff Index: sys/dev/acpica/acpi_ec.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpi_ec.c,v retrieving revision 1.56 diff -u -r1.56 acpi_ec.c --- sys/dev/acpica/acpi_ec.c 1 Jul 2004 00:51:31 -0000 1.56 +++ sys/dev/acpica/acpi_ec.c 1 Jul 2004 15:06:46 -0000 @@ -366,6 +366,7 @@ void acpi_ec_ecdt_probe(device_t parent) { + ACPI_TABLE_HEADER *hdr; ACPI_TABLE_ECDT *ecdt; ACPI_STATUS status; device_t child; @@ -375,8 +376,8 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* Find and validate the ECDT. */ - status = AcpiGetFirmwareTable("ECDT", 1, ACPI_LOGICAL_ADDRESSING, - (ACPI_TABLE_HEADER **)&ecdt); + status = AcpiGetFirmwareTable("ECDT", 1, ACPI_LOGICAL_ADDRESSING, &hdr); + ecdt = (ACPI_TABLE_ECDT *)hdr; if (ACPI_FAILURE(status) || ecdt->control.RegisterBitWidth != 8 || ecdt->data.RegisterBitWidth != 8) { Index: sys/i386/acpica/acpi_wakeup.c =================================================================== RCS file: /home/ncvs/src/sys/i386/acpica/acpi_wakeup.c,v retrieving revision 1.33 diff -u -r1.33 acpi_wakeup.c --- sys/i386/acpica/acpi_wakeup.c 6 May 2004 02:18:58 -0000 1.33 +++ sys/i386/acpica/acpi_wakeup.c 1 Jul 2004 15:11:53 -0000 @@ -307,11 +307,13 @@ return; } - if (bus_dmamem_alloc(acpi_waketag, (void **)&acpi_wakeaddr, + void *wakeaddr = (void *)acpi_wakeaddr; + if (bus_dmamem_alloc(acpi_waketag, &wakeaddr, BUS_DMA_NOWAIT, &acpi_wakemap)) { printf("acpi_alloc_wakeup_handler: can't alloc wake memory\n"); return; } + acpi_wakeaddr = (vm_offset_t)wakeaddr; } SYSINIT(acpiwakeup, SI_SUB_KMEM, SI_ORDER_ANY, acpi_alloc_wakeup_handler, 0) --=-=-=--