From owner-svn-src-head@FreeBSD.ORG Mon Mar 8 21:09:28 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF391106564A; Mon, 8 Mar 2010 21:09:28 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id AFC168FC1B; Mon, 8 Mar 2010 21:09:28 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 639C646B37; Mon, 8 Mar 2010 16:09:28 -0500 (EST) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPA id 30C768A021; Mon, 8 Mar 2010 16:09:27 -0500 (EST) From: John Baldwin To: "Jung-uk Kim" Date: Mon, 8 Mar 2010 16:09:25 -0500 User-Agent: KMail/1.12.1 (FreeBSD/7.3-CBSD-20100217; KDE/4.3.1; amd64; ; ) References: <201003081940.o28JeVG1088074@svn.freebsd.org> In-Reply-To: <201003081940.o28JeVG1088074@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201003081609.25643.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Mon, 08 Mar 2010 16:09:27 -0500 (EST) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.6 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r204877 - head/sys/modules/acpi/acpi X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Mar 2010 21:09:29 -0000 On Monday 08 March 2010 2:40:31 pm Jung-uk Kim wrote: > Author: jkim > Date: Mon Mar 8 19:40:31 2010 > New Revision: 204877 > URL: http://svn.freebsd.org/changeset/base/204877 > > Log: > Enable ACPI module build on amd64. Although we strongly recommend building > it into kernel, there is no need to prevent it from building at all. > > Modified: > head/sys/modules/acpi/acpi/Makefile > > Modified: head/sys/modules/acpi/acpi/Makefile > ============================================================================== > --- head/sys/modules/acpi/acpi/Makefile Mon Mar 8 19:40:22 2010 (r204876) > +++ head/sys/modules/acpi/acpi/Makefile Mon Mar 8 19:40:31 2010 (r204877) > @@ -1,11 +1,11 @@ > # $FreeBSD$ > > -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" > -.error "ACPI can only be compiled into the kernel on the amd64 and ia64 platforms" > +.if ${MACHINE_ARCH} == "ia64" > +.error "ACPI can only be compiled into the kernel on the ia64 platform" > .endif > > -.if ${MACHINE} != "i386" > -.error "The ACPI module is only for i386" > +.if ${MACHINE} != "amd64" && ${MACHINE} != "i386" > +.error "The ACPI module is only for amd64 and i386" > .endif > > .PATH: ${.CURDIR}/../../../contrib/dev/acpica/debugger \ > @@ -97,9 +97,13 @@ opt_ddb.h: Makefile > SRCS+= acpi_machdep.c acpi_wakecode.h acpi_wakeup.c > SRCS+= assym.s madt.c > CLEANFILES+= acpi_wakecode.bin acpi_wakecode.h acpi_wakecode.o > + > .if ${MACHINE_ARCH} == "amd64" > -SRCS+= opt_global.h > +SRCS+= acpi_switch.S opt_global.h > CLEANFILES+= acpi_wakedata.h > +ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} > +acpi_switch.o: acpi_switch.S > + ${CC} -c ${ASM_CFLAGS} ${WERROR} ${.IMPSRC} > .endif > > acpi_wakecode.h: acpi_wakecode.S assym.s > -- John Baldwin