[src/chs-ubc2]: src/sys/arch/alpha/common Update from current.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e430bca17dad
branches:  chs-ubc2
changeset: 471418:e430bca17dad
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Aug 02 19:33:24 1999 +0000

description:
Update from current.

diffstat:

 sys/arch/alpha/common/bus_dma.c       |  8 ++++----
 sys/arch/alpha/common/sgmap_typedep.c |  7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (57 lines):

diff -r e331d0b6b653 -r e430bca17dad sys/arch/alpha/common/bus_dma.c
--- a/sys/arch/alpha/common/bus_dma.c   Mon Aug 02 19:30:58 1999 +0000
+++ b/sys/arch/alpha/common/bus_dma.c   Mon Aug 02 19:33:24 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.29.4.1 1999/06/21 00:46:07 thorpej Exp $ */
+/* $NetBSD: bus_dma.c,v 1.29.4.2 1999/08/02 19:33:24 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.29.4.1 1999/06/21 00:46:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.29.4.2 1999/08/02 19:33:24 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -162,8 +162,8 @@
                 * Get the physical address for this segment.
                 */
                if (p != NULL)
-                       curaddr = pmap_extract(p->p_vmspace->vm_map.pmap,
-                           vaddr);
+                       (void) pmap_extract(p->p_vmspace->vm_map.pmap,
+                           vaddr, &curaddr);
                else
                        curaddr = vtophys(vaddr);
 
diff -r e331d0b6b653 -r e430bca17dad sys/arch/alpha/common/sgmap_typedep.c
--- a/sys/arch/alpha/common/sgmap_typedep.c     Mon Aug 02 19:30:58 1999 +0000
+++ b/sys/arch/alpha/common/sgmap_typedep.c     Mon Aug 02 19:33:24 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sgmap_typedep.c,v 1.12 1998/08/14 16:50:02 thorpej Exp $ */
+/* $NetBSD: sgmap_typedep.c,v 1.12.8.1 1999/08/02 19:33:24 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-__KERNEL_RCSID(0, "$NetBSD: sgmap_typedep.c,v 1.12 1998/08/14 16:50:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgmap_typedep.c,v 1.12.8.1 1999/08/02 19:33:24 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -188,7 +188,8 @@
                 * Get the physical address for this segment.
                 */
                if (p != NULL)
-                       pa = pmap_extract(p->p_vmspace->vm_map.pmap, va);
+                       (void) pmap_extract(p->p_vmspace->vm_map.pmap, va,
+                           &pa);
                else
                        pa = vtophys(va);