CVS commit: src/sys/dev/i2o

[Aleksej Saushev]

Module Name:    src
Committed By:   asau
Date:           Fri Feb 19 12:36:15 UTC 2010

Modified Files:
        src/sys/dev/i2o: iop.c

Log Message:
Don't mix BUS_DMASYNC_PREREAD and BUS_DMASYNC_POSTWRITE.
Suggested by <bouyer>, fixes PR kern/42662


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/i2o/iop.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/i2o/iop.c
diff -u src/sys/dev/i2o/iop.c:1.77 src/sys/dev/i2o/iop.c:1.78
--- src/sys/dev/i2o/iop.c:1.77	Wed Oct 21 21:12:05 2009
+++ src/sys/dev/i2o/iop.c	Fri Feb 19 12:36:15 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: iop.c,v 1.77 2009/10/21 21:12:05 rmind Exp $	*/
+/*	$NetBSD: iop.c,v 1.78 2010/02/19 12:36:15 asau Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.77 2009/10/21 21:12:05 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.78 2010/02/19 12:36:15 asau Exp $");
 
 #include "iop.h"
 
@@ -928,7 +928,7 @@
 	    BUS_DMASYNC_PREWRITE);
 	memset(st, 0, sizeof(*st));
 	bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*st),
-	    BUS_DMASYNC_PREREAD|BUS_DMASYNC_POSTWRITE);
+	    BUS_DMASYNC_POSTWRITE);
 
 	if ((rv = iop_post(sc, (u_int32_t *)&mf)) != 0)
 		return (rv);
@@ -993,7 +993,7 @@
 	    BUS_DMASYNC_PREWRITE);
 	*sw = 0;
 	bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*sw),
-	    BUS_DMASYNC_PREREAD|BUS_DMASYNC_POSTWRITE);
+	    BUS_DMASYNC_POSTWRITE);
 
 	if ((rv = iop_post(sc, mb)) != 0)
 		return (rv);