From owner-p4-projects@FreeBSD.ORG  Sun Aug 24 22:09:29 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B9C3416A4C1; Sun, 24 Aug 2003 22:09:27 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7085F16A4BF
	for <perforce@freebsd.org>; Sun, 24 Aug 2003 22:09:27 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 02BE043F85
	for <perforce@freebsd.org>; Sun, 24 Aug 2003 22:09:27 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7P59Q0U018905
	for <perforce@freebsd.org>; Sun, 24 Aug 2003 22:09:26 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7P59PNs018902
	for perforce@freebsd.org; Sun, 24 Aug 2003 22:09:25 -0700 (PDT)
Date: Sun, 24 Aug 2003 22:09:25 -0700 (PDT)
Message-Id: <200308250509.h7P59PNs018902@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 36869 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Aug 2003 05:09:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=36869

Change 36869 by sam@sam_ebb on 2003/08/24 22:08:48

	fix merge botch

Affected files ...

.. //depot/projects/netperf/sys/dev/ata/ata-dma.c#5 edit

Differences ...

==== //depot/projects/netperf/sys/dev/ata/ata-dma.c#5 (text+ko) ====

@@ -223,16 +223,10 @@
 	return -1;
     }
     if (count > ch->dma->max_iosize) {
-#if 0
 	ata_prtdev(atadev,
 		   "FAILURE - oversized DMA transfer attempted %d > %d\n",
 		   count, ch->dma->max_iosize);
 	return -1;
-#else
-	ata_prtdev(atadev,
-		   "WARNING - oversized DMA transfer attempted %d > %d\n",
-		   count, ch->dma->max_iosize);
-#endif
     }
     return 0;
 }