autoconf.c:

	Convert autoconf hooks from old SCSI system to CAM.

busdma_machdep.c:
	bus_dmamap_free() should expect the nobounce map, not a NULL one.

mountroot.c:
swapgeneric.c:
	da and od changes.

symbols.raw:
	Nuke the old disk stat symbols.

userconfig.c:
	Disable the SCSI listing code until it can be converted to CAM.

2 files changed, 6 insertions, 10 deletions

diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 0c6748a..3b67b26 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.104 1998/09/03 20:59:28 nsouch Exp $
+ *	$Id: autoconf.c,v 1.105 1998/09/14 19:56:38 sos Exp $
  */
 
 /*
@@ -98,9 +98,6 @@
 #endif
 
 #include "scbus.h"
-#if NSCBUS > 0
-#include <scsi/scsiconf.h>
-#endif
 
 #include <sys/bus.h>
 
@@ -174,20 +171,19 @@ find_cdrom_root()
 }
 #endif /* CD9660 */
 
+extern void xpt_init __P((void));
+
 static void
 configure_start()
 {
 #if NSCBUS > 0
-	scsi_configure_start();
+	xpt_init();
 #endif
 }
 
 static void
 configure_finish()
 {
-#if NSCBUS > 0
-	scsi_configure_finish();
-#endif
 }
 
 /*
diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index a09cb48..9a3542e 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: busdma_machdep.c,v 1.6 1998/05/06 01:45:55 gibbs Exp $
+ *      $Id: busdma_machdep.c,v 1.7 1998/07/11 07:45:28 bde Exp $
  */
 
 #include <sys/param.h>
@@ -346,7 +346,7 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
 	 * dmamem does not need to be bounced, so the map should be
 	 * NULL
 	 */
-	if (map != NULL)
+	if (map != &nobounce_dmamap)
 		panic("bus_dmamem_free: Invalid map freed\n");
 	free(vaddr, M_DEVBUF);
 }