From owner-p4-projects@FreeBSD.ORG  Wed Jun 25 21:05:32 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C93C937B404; Wed, 25 Jun 2003 21:05:31 -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 6667237B401
	for <perforce@freebsd.org>; Wed, 25 Jun 2003 21:05:31 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0B2444402F
	for <perforce@freebsd.org>; Wed, 25 Jun 2003 21:05:31 -0700 (PDT)
	(envelope-from peter@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 h5Q45U0U084261
	for <perforce@freebsd.org>; Wed, 25 Jun 2003 21:05:30 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5Q45UPN084258
	for perforce@freebsd.org; Wed, 25 Jun 2003 21:05:30 -0700 (PDT)
Date: Wed, 25 Jun 2003 21:05:30 -0700 (PDT)
Message-Id: <200306260405.h5Q45UPN084258@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 33689 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: Thu, 26 Jun 2003 04:05:32 -0000

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

Change 33689 by peter@peter_daintree on 2003/06/25 21:05:29

	IFC @33688

Affected files ...

.. //depot/projects/hammer/sys/amd64/conf/GENERIC#20 integrate
.. //depot/projects/hammer/sys/dev/ciss/ciss.c#9 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/conf/GENERIC#20 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.388 2003/06/26 03:49:54 peter Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.389 2003/06/26 04:01:59 peter Exp $
 
 machine		amd64
 cpu		HAMMER

==== //depot/projects/hammer/sys/dev/ciss/ciss.c#9 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/ciss/ciss.c,v 1.22 2003/05/31 18:41:09 phk Exp $
+ *	$FreeBSD: src/sys/dev/ciss/ciss.c,v 1.23 2003/06/26 04:01:34 ps Exp $
  */
 
 /*
@@ -758,7 +758,7 @@
 	return(ENOMEM);
     }
     bus_dmamap_load(sc->ciss_command_dmat, sc->ciss_command_map, sc->ciss_command, 
-		    sizeof(struct ciss_command) * sc->ciss_max_requests,
+		    CISS_COMMAND_ALLOC_SIZE * sc->ciss_max_requests,
 		    ciss_command_map_helper, sc, 0);
     bzero(sc->ciss_command, CISS_COMMAND_ALLOC_SIZE * sc->ciss_max_requests);