 @@ -1,14 +1,14 @@
-/*	$NetBSD: dvma.c,v 1.42 2013/09/06 17:43:19 tsutsui Exp $	*/
+/*	$NetBSD: dvma.c,v 1.43 2013/11/07 02:37:56 christos Exp $	*/
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Gordon W. Ross and Jeremy Cooper.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,27 +59,27 @@
  * a specially reserved section of the CPU's virtual address space, 16
  * Megabytes in size.  Whenever a DVMA buffer is allocated, the allocation
  * code will enter in a mapping both in the MC68030 MMU page tables and the
  * I/O mapper.
+ *
  * The address returned by the allocation routine is a virtual address that
  * the requesting driver must use to access the buffer.  It is up to the
  * device driver to convert this virtual address into the appropriate slave
  * address that its device should issue to access the buffer.  (There will be
  * routines that assist the driver in doing so.)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.42 2013/09/06 17:43:19 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.43 2013/11/07 02:37:56 christos Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/core.h>
 #include <sys/exec.h>
 #include <uvm/uvm_extern.h>
 @@ -156,27 +156,27 @@ dvma_kvtopa(void *kva, int bustype)
 /*
  * Map a range [va, va+len] of wired virtual addresses in the given map
  * to a kernel address in DVMA space.
  */
 void *
 dvma_mapin(void *kmem_va, int len, int canwait)
+{
 	void *dvma_addr;
 	vaddr_t kva, tva;
 	int npf, s, error;
 	paddr_t pa;
 	long off;
-	bool rv;
+	bool rv __debugused;
 	kva = (vaddr_t)kmem_va;
 #ifdef	DIAGNOSTIC
 	/*
 	 * Addresses below VM_MIN_KERNEL_ADDRESS are not part of the kernel
 	 * map and should not participate in DVMA.
 	 */
 	if (kva < VM_MIN_KERNEL_ADDRESS)
 		panic("dvma_mapin: bad kva");
 #endif
 	/*
 	 * Calculate the offset of the data buffer from a page boundary.
 @@ -294,27 +294,27 @@ _bus_dmamap_load_raw(bus_dma_tag_t t, bu
+{
 	panic("_bus_dmamap_load_raw(): not implemented yet.");
+}
 int
 _bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
     bus_size_t buflen, struct proc *p, int flags)
+{
 	vaddr_t kva, dva;
 	vsize_t off, sgsize;
 	paddr_t pa;
 	pmap_t pmap;
-	int error, rv, s;
+	int error, rv __diagused, s;
 	/*
 	 * Make sure that on error condition we return "no valid mappings".
 	 */
 	map->dm_nsegs = 0;
 	map->dm_mapsize = 0;
 	if (buflen > map->_dm_size)
 		return EINVAL;
 	kva = (vaddr_t)buf;
 	off = kva & PGOFSET;
 	sgsize = round_page(off + buflen);
 @@ -359,27 +359,27 @@ _bus_dmamap_load(bus_dma_tag_t t, bus_dm
 	map->dm_nsegs = 1;
 	map->dm_mapsize = map->dm_segs[0].ds_len;
 	return 0;
+}
 void
 _bus_dmamap_unload(bus_dma_tag_t t, bus_dmamap_t map)
+{
 	bus_dma_segment_t *segs;
 	vaddr_t dva;
 	vsize_t sgsize;
-	int error, s;
+	int error __diagused, s;
 #ifdef DIAGNOSTIC
 	if (map->dm_nsegs != 1)
 		panic("%s: invalid nsegs = %d", __func__, map->dm_nsegs);
 #endif
 	segs = map->dm_segs;
 	dva = segs[0]._ds_va & ~PGOFSET;
 	sgsize = segs[0]._ds_sgsize;
 	/* Unmap the DVMA addresses. */
 	iommu_remove((dva & IOMMU_VA_MASK), sgsize);
 	pmap_kremove(dva, sgsize);