aboutsummaryrefslogtreecommitdiff
path: root/i386/intel/pmap.h
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2016-09-20 22:11:24 +0200
committerRichard Braun <rbraun@sceen.net>2016-09-21 00:21:05 +0200
commit38aca37c00548f9b31bf17e74ab4a36c73521782 (patch)
tree41833d6c6e222e2bdc2410e963d53302c4654209 /i386/intel/pmap.h
parent66a878640573dd9101e3915db44408b661220038 (diff)
downloadgnumach-38aca37c00548f9b31bf17e74ab4a36c73521782.tar.gz
gnumach-38aca37c00548f9b31bf17e74ab4a36c73521782.tar.bz2
gnumach-38aca37c00548f9b31bf17e74ab4a36c73521782.zip
Replace vm_offset_t with phys_addr_t where appropriate
* i386/i386/phys.c (pmap_zero_page, pmap_copy_page, copy_to_phys, copy_from_phys, kvtophys): Use the phys_addr_t type for physical addresses. * i386/intel/pmap.c (pmap_map, pmap_map_bd, pmap_destroy, pmap_remove_range, pmap_page_protect, pmap_enter, pmap_extract, pmap_collect, phys_attribute_clear, phys_attribute_test, pmap_clear_modify, pmap_is_modified, pmap_clear_reference, pmap_is_referenced): Likewise. * i386/intel/pmap.h (pt_entry_t): Unconditionally define as a phys_addr_t. (pmap_zero_page, pmap_copy_page, kvtophys): Use the phys_addr_t type for physical addresses. * vm/pmap.h (pmap_enter, pmap_page_protect, pmap_clear_reference, pmap_is_referenced, pmap_clear_modify, pmap_is_modified, pmap_extract, pmap_map_bd): Likewise. * vm/vm_page.h (vm_page_fictitious_addr): Declare as a phys_addr_t. * vm/vm_resident.c (vm_page_fictitious_addr): Likewise. (vm_page_grab_phys_addr): Change return type to phys_addr_t.
Diffstat (limited to 'i386/intel/pmap.h')
-rw-r--r--i386/intel/pmap.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/i386/intel/pmap.h b/i386/intel/pmap.h
index 382cd5f4..e6a3ede8 100644
--- a/i386/intel/pmap.h
+++ b/i386/intel/pmap.h
@@ -64,11 +64,7 @@
* i386/i486 Page Table Entry
*/
-#if PAE
-typedef unsigned long long pt_entry_t;
-#else /* PAE */
-typedef unsigned int pt_entry_t;
-#endif /* PAE */
+typedef phys_addr_t pt_entry_t;
#define PT_ENTRY_NULL ((pt_entry_t *) 0)
#endif /* __ASSEMBLER__ */
@@ -447,19 +443,19 @@ extern void pmap_unmap_page_zero (void);
/*
* pmap_zero_page zeros the specified (machine independent) page.
*/
-extern void pmap_zero_page (vm_offset_t);
+extern void pmap_zero_page (phys_addr_t);
/*
* pmap_copy_page copies the specified (machine independent) pages.
*/
-extern void pmap_copy_page (vm_offset_t, vm_offset_t);
+extern void pmap_copy_page (phys_addr_t, phys_addr_t);
/*
* kvtophys(addr)
*
* Convert a kernel virtual address to a physical address
*/
-extern vm_offset_t kvtophys (vm_offset_t);
+extern phys_addr_t kvtophys (vm_offset_t);
void pmap_remove_range(
pmap_t pmap,