Remove Mem.AddrSpace.alloc_and_map(); a Mappable that allocates

[polintos/scott/priv.git] / kernel / include / kern / mem.h

diff --git a/kernel/include/kern/mem.h b/kernel/include/kern/mem.h
index 2e1cdc240b60e401b572dda15b890f6406b8b09f..be628b4ccbb204adca4b0c63e1c764e44205b353 100644 (file)
--- 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;
        };
@@ -400,9 +400,6 @@ namespace Mem {
                void get_mappable(IMappable *ma);
                void clone(IAddrSpace *addrspace, u8 clone_is_real);
 
-               void alloc_and_map(u64 len, u64 *vstart,
-                                  AllocFlags aflags, MapFlags mflags);
-
                enum {
                        map_user,
                        map_protected,
@@ -410,7 +407,7 @@ namespace Mem {
                };
 
                void map(IMappable ma, Region region, u64 *vstart, MapFlags mflags,
-                        bool from_kernel = false, int map_type = map_user);
+                        int map_type = map_user);
                void unmap(Region region, bool from_kernel = false);
                
                void set_mapflags(Region region, MapFlags mflags);