CVS commit: src/sys/arch/usermode/usermode

[Reinoud Zandijk]

Module Name:    src
Committed By:   reinoud
Date:           Thu Sep 15 15:20:17 UTC 2011

Modified Files:
        src/sys/arch/usermode/usermode: pmap.c

Log Message:
Cleanup pmap_extract(); no functional change


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/usermode/usermode/pmap.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/arch/usermode/usermode/pmap.c
diff -u src/sys/arch/usermode/usermode/pmap.c:1.67 src/sys/arch/usermode/usermode/pmap.c:1.68
--- src/sys/arch/usermode/usermode/pmap.c:1.67	Thu Sep 15 15:08:51 2011
+++ src/sys/arch/usermode/usermode/pmap.c	Thu Sep 15 15:20:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.67 2011/09/15 15:08:51 reinoud Exp $ */
+/* $NetBSD: pmap.c,v 1.68 2011/09/15 15:20:17 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2011 Reinoud Zandijk <rein...@netbsd.org>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.67 2011/09/15 15:08:51 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.68 2011/09/15 15:20:17 reinoud Exp $");
 
 #include "opt_memsize.h"
 #include "opt_kmempages.h"
@@ -911,23 +911,23 @@
 }
 
 bool
-pmap_extract(pmap_t pmap, vaddr_t va, paddr_t *pap)
+pmap_extract(pmap_t pmap, vaddr_t va, paddr_t *ppa)
 {
 	struct pv_entry *pv;
+	intptr_t lpn;
 
-	/* TODO protect against roque values */
 	dprintf_debug("pmap_extract: extracting va %p\n", (void *) va);
 #ifdef DIAGNOSTIC
 	if ((va < VM_MIN_ADDRESS) || (va > VM_MAX_ADDRESS))
 		panic("pmap_extract: invalid va isued\n");
 #endif
-	pv = pmap->pm_entries[atop(va - VM_MIN_ADDRESS)]; /* V->L */
+	lpn = atop(va - VM_MIN_ADDRESS);	/* V->L */
+	pv = pmap->pm_entries[lpn];
 
 	if (pv == NULL)
 		return false;
-
-	if (pap)
-		*pap = ptoa(pv->pv_ppn);
+	if (ppa)
+		*ppa = ptoa(pv->pv_ppn);
 	return true;
 }