From owner-freebsd-current@FreeBSD.ORG  Mon Jul  5 04:30:44 2004
Return-Path: <owner-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 D40C116A4CE
	for <current@freebsd.org>; Mon,  5 Jul 2004 04:30:44 +0000 (GMT)
Received: from arbornet.org (m-net.arbornet.org [209.142.209.161])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 688A743D4C
	for <current@freebsd.org>; Mon,  5 Jul 2004 04:30:44 +0000 (GMT)
	(envelope-from junsu@m-net.arbornet.org)
Received: from m-net.arbornet.org (localhost [127.0.0.1])
	by arbornet.org (8.12.3p2/8.11.2) with ESMTP id i654Xdar004578
	for <current@freebsd.org>; Mon, 5 Jul 2004 00:33:39 -0400 (EDT)
	(envelope-from junsu@m-net.arbornet.org)
Received: (from junsu@localhost)
	by m-net.arbornet.org (8.12.3p2/8.12.3/Submit) id i654Xc4D004572
	for current@freebsd.org; Mon, 5 Jul 2004 00:33:38 -0400 (EDT)
Date: Mon, 5 Jul 2004 00:33:38 -0400 (EDT)
From: Jun Su <junsu@m-net.arbornet.org>
Message-Id: <200407050433.i654Xc4D004572@m-net.arbornet.org>
To: current@freebsd.org
X-Mailman-Approved-At: Mon, 05 Jul 2004 05:07:08 +0000
Subject: [PATCH] fix acpica in i386 compiling with -O2
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jul 2004 04:30:44 -0000

this is a quick fix.
===
--- acpi_wakeup.c~      Sun Jul  4 12:42:07 2004
+++ acpi_wakeup.c       Mon Jul  5 11:25:29 2004
@@ -295,6 +295,7 @@
 static void
 acpi_alloc_wakeup_handler(void)
 {
+       void *addr = 0;
        if (!cold)
                return;

@@ -307,11 +308,12 @@
                return;
        }

-       if (bus_dmamem_alloc(acpi_waketag, (void **)&acpi_wakeaddr,
+       if (bus_dmamem_alloc(acpi_waketag, (void **)&addr,
                             BUS_DMA_NOWAIT, &acpi_wakemap)) {
                printf("acpi_alloc_wakeup_handler: can't alloc wake memory\n");
                return;
        }
+       acpi_wakeaddr = (vm_offset_t)addr;
 }

 SYSINIT(acpiwakeup, SI_SUB_KMEM, SI_ORDER_ANY, acpi_alloc_wakeup_handler, 0)