From owner-svn-src-all@FreeBSD.ORG Tue May 6 16:01:59 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0FE2146E; Tue, 6 May 2014 16:01:59 +0000 (UTC) Received: from alchemy.franken.de (alchemy.franken.de [194.94.249.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "alchemy.franken.de", Issuer "alchemy.franken.de" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 80A3A250; Tue, 6 May 2014 16:01:58 +0000 (UTC) Received: from alchemy.franken.de (localhost [127.0.0.1]) by alchemy.franken.de (8.14.8/8.14.8/ALCHEMY.FRANKEN.DE) with ESMTP id s46G1sN6094706 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 6 May 2014 18:01:54 +0200 (CEST) (envelope-from marius@alchemy.franken.de) Received: (from marius@localhost) by alchemy.franken.de (8.14.8/8.14.8/Submit) id s46G1s20094705; Tue, 6 May 2014 18:01:54 +0200 (CEST) (envelope-from marius) Date: Tue, 6 May 2014 18:01:54 +0200 From: Marius Strobl To: Hans Petter Selasky Subject: Re: svn commit: r265359 - head/sys/modules/sound/sound Message-ID: <20140506160154.GA679@alchemy.franken.de> References: <201405051431.s45EVZ2q027729@svn.freebsd.org> <7745BD19-5BAE-47BD-8DE4-10CF7E23FA9D@gmail.com> <53690381.9040909@selasky.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <53690381.9040909@selasky.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (alchemy.franken.de [0.0.0.0]); Tue, 06 May 2014 18:01:54 +0200 (CEST) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , Warner Losh X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2014 16:01:59 -0000 On Tue, May 06, 2014 at 05:45:05PM +0200, Hans Petter Selasky wrote: > On 05/05/14 22:39, Warner Losh wrote: > > > > On May 5, 2014, at 8:31 AM, Hans Petter Selasky wrote: > > > >> Author: hselasky > >> Date: Mon May 5 14:31:34 2014 > >> New Revision: 265359 > >> URL: http://svnweb.freebsd.org/changeset/base/265359 > >> > >> Log: > >> Build the kernel sound module without ISA DMA support for ARM and MIPS > >> platforms, because these platforms do not implement the ISA DMA > >> API. Else the sound modules cannot be loaded when running these > >> platforms. > >> > >> MFC after: 2 weeks > >> > >> Modified: > >> head/sys/modules/sound/sound/Makefile > >> > >> Modified: head/sys/modules/sound/sound/Makefile > >> ============================================================================== > >> --- head/sys/modules/sound/sound/Makefile Mon May 5 11:50:52 2014 (r265358) > >> +++ head/sys/modules/sound/sound/Makefile Mon May 5 14:31:34 2014 (r265359) > >> @@ -44,7 +44,8 @@ CLEANFILES+= feeder_eq_gen.h feeder_rate > >> > >> EXPORT_SYMS= YES # XXX evaluate > >> > >> -.if ${MACHINE_CPUARCH} == "sparc64" || ${MACHINE_CPUARCH} == "powerpc" > >> +.if ${MACHINE_CPUARCH} == "sparc64" || ${MACHINE_CPUARCH} == "powerpc" || \ > >> + ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "mips" > >> # Create an empty opt_isa.h in order to keep kmod.mk from linking in an > >> # existing one from KERNBUILDDIR which possibly has DEV_ISA defined so > >> # sound.ko is always built without isadma support. > > > > Rather than an opt-in approach here, why not lust list the three that have it since > > they are the only ones that will ever have it? > > > > Warner > > > > Hi, > > Maybe the sound DMA file belongs in its own module? > It's not just sndbuf_dma.c but also the #ifdef'ed DEV_ISA code in channel.c on architectures that have ISA but not ISA DMA support, hence the current kludge. Marius