PERFORCE change 33689 for review

[Peter Wemm]

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

Change 33689 by peter at 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);