From owner-cvs-all@FreeBSD.ORG  Thu Sep 18 02:21:54 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 10DAA16A4C1
	for <cvs-all@FreeBSD.org>; Thu, 18 Sep 2003 02:21:54 -0700 (PDT)
Received: from falcon.midgard.homeip.net (h76n3fls24o1048.bredband.comhem.se
	[213.67.148.76])	by mx1.FreeBSD.org (Postfix) with SMTP id 16B8443FE9
	for <cvs-all@FreeBSD.org>; Thu, 18 Sep 2003 02:21:50 -0700 (PDT)
	(envelope-from ertr1013@student.uu.se)
Received: (qmail 53477 invoked by uid 1001); 18 Sep 2003 09:21:47 -0000
Date: Thu, 18 Sep 2003 11:21:47 +0200
From: Erik Trulsson <ertr1013@student.uu.se>
To: Luoqi Chen <luoqi@FreeBSD.org>
Message-ID: <20030918092147.GA52690@falcon.midgard.homeip.net>
Mail-Followup-To: Luoqi Chen <luoqi@FreeBSD.org>,
	src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org,
	re@freebsd.org
References: <200309050729.h857TBIE092694@repoman.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200309050729.h857TBIE092694@repoman.freebsd.org>
User-Agent: Mutt/1.5.4i
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: re@freebsd.org
cc: cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/dev/ata ata-all.c ata-all.h ata-disk.c
	ata-disk.h ata-dma.c ata-isa.c atapi-all.c atapi-all.h atapi-cd.c
	atapi-fd.c atapi-tape.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Sep 2003 09:21:54 -0000

On Fri, Sep 05, 2003 at 12:29:11AM -0700, Luoqi Chen wrote:
> luoqi       2003/09/05 00:29:11 PDT
> 
>   FreeBSD src repository
> 
>   Modified files:        (Branch: RELENG_4)
>     sys/dev/ata          ata-all.c ata-all.h ata-disk.c ata-disk.h 
>                          ata-dma.c ata-isa.c atapi-all.c 
>                          atapi-all.h atapi-cd.c atapi-fd.c 
>                          atapi-tape.c 
>   Log:
>   MFC: ata driver bus dma code.
>   
>   Eyeballed by:   sos
>   Approved by:    re

This commit breaks compilation of non-PCI kernels, as I just discovered
while updating one of my machines.  The following patch makes the compilation
work again:



Index: ata-isa.c
===================================================================
RCS file: /ncvs/src/sys/dev/ata/ata-isa.c,v
retrieving revision 1.4.2.2
diff -u -r1.4.2.2 ata-isa.c
--- ata-isa.c	5 Sep 2003 07:29:10 -0000	1.4.2.2
+++ ata-isa.c	18 Sep 2003 09:07:24 -0000
@@ -134,9 +134,10 @@
     return -1;
 }
 
-void
+int
 ata_dmastart(struct ata_device *atadev, caddr_t data, int32_t count, int dir)
 {
+	return -1;
 }
 
 int




-- 
<Insert your favourite quote here.>
Erik Trulsson
ertr1013@student.uu.se