X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=kernel%2Finclude%2Fkern%2Fmem.h;h=ac60e84ba663644e8e3ab3a970baf267b442927d;hp=2e1cdc240b60e401b572dda15b890f6406b8b09f;hb=223354cf6f772fe854996a22e776b3fa83490f44;hpb=b60e27a3186098774f15e08972ed4671298569fd

diff --git a/kernel/include/kern/mem.h b/kernel/include/kern/mem.h
index 2e1cdc2..ac60e84 100644
--- a/kernel/include/kern/mem.h
+++ b/kernel/include/kern/mem.h
@@ -157,7 +157,7 @@ namespace Mem {
 		// other flags are undefined, and pagein() should be retried.
 		// rmap_lock must be held.
 		
-		virtual void get_entry(u64 vaddr, u64 *phys, PTEFlags *flags) = 0;
+		virtual void get_mapping(u64 vaddr, u64 *phys, PTEFlags *flags) = 0;
 
 		#include <servers/mem/addrspace/Mem/Mappable.h>
 		
@@ -218,7 +218,7 @@ namespace Mem {
 	};
 	
 	// This lock protects the rmap chains and rmap tables.  It also makes
-	// atomic the PageTable::get_entry, RMapTable::map, PageTable::map
+	// atomic the PageTable::get_mapping, RMapTable::map, PageTable::map
 	// sequence.
 	//
 	// OPT: This lock is acquired on all map/unmap activity; if/when this
@@ -284,7 +284,7 @@ namespace Mem {
 		// other flags are undefined.  This function is mainly used for
 		// propagating stacked aspace PTEs.
 		
-		virtual void get_entry(u64 vaddr, u64 *phys, Flags *flags) = 0;
+		virtual void get_mapping(u64 vaddr, u64 *phys, Flags *flags) = 0;
 		
 		virtual void get_size(u64 *size) = 0;
 		
@@ -318,7 +318,7 @@ namespace Mem {
 	
 		// Unexported
 		virtual void pagein(u64 vaddr, PTEFlags reqflags);
-		virtual void get_entry(u64 vaddr, u64 *phys, PTEFlags *flags);
+		virtual void get_mapping(u64 vaddr, u64 *phys, PTEFlags *flags);
 
 		friend class AddrSpace;
 	};