- Cleanup whitespace and extra ()s in vtophys() macros.

- Move vtophys() macros next to vtopte() where vtopte() exists to match
  comments above vtopte().
- Remove references to the alternate address space in the comment above
  vtopte().  amd64 never had the alternate address space, and i386 lost it
  prior to PAE support being added.
- s/entires/entries/ in comments.

Reviewed by:	alc

1 files changed, 3 insertions, 4 deletions

diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 0324658..5e20c5e 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -45,7 +45,7 @@
 #define	_MACHINE_PMAP_H_
 
 /*
- * Page-directory and page-table entires follow this format, with a few
+ * Page-directory and page-table entries follow this format, with a few
  * of the fields not present here and there, depending on a lot of things.
  */
 				/* ---- Intel Nomenclature ---- */
@@ -177,11 +177,12 @@ extern pd_entry_t *IdlePTD;	/* physical address of "Idle" state directory */
 #ifdef _KERNEL
 /*
  * virtual address to page table entry and
- * to physical address. Likewise for alternate address space.
+ * to physical address.
  * Note: these work recursively, thus vtopte of a pte will give
  * the corresponding pde that in turn maps it.
  */
 #define	vtopte(va)	(PTmap + i386_btop(va))
+#define	vtophys(va)	pmap_kextract((vm_offset_t)(va))
 
 /*
  *	Routine:	pmap_kextract
@@ -203,8 +204,6 @@ pmap_kextract(vm_offset_t va)
 	return pa;
 }
 
-#define	vtophys(va)	pmap_kextract(((vm_offset_t) (va)))
-
 #ifdef PAE
 
 static __inline pt_entry_t