diff options
| author | Richard Braun <rbraun@sceen.net> | 2013-07-09 20:53:31 +0200 |
|---|---|---|
| committer | Richard Braun <rbraun@sceen.net> | 2013-07-09 20:54:24 +0200 |
| commit | d485f7e4480e06003095d0f94e022dfca3c84a0d (patch) | |
| tree | 6d754241ad8c180220caa83d29a86e3ce652425c /vm/vm_map.c | |
| parent | 38dad0326a0c22676e64d757223df6f97f19eac0 (diff) | |
vm/vm_phys: merge into the vm_page module
The original idea was to separate physical page allocation from page list
management, but it doesn't make much sense any more.
Diffstat (limited to 'vm/vm_map.c')
| -rw-r--r-- | vm/vm_map.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vm/vm_map.c b/vm/vm_map.c index d6000e19..da47b189 100644 --- a/vm/vm_map.c +++ b/vm/vm_map.c @@ -49,7 +49,6 @@ #include <vm/vm_map.h> #include <vm/vm_kmem.h> #include <vm/vm_page.h> -#include <vm/vm_phys.h> #include <vm/vm_prot.h> /* @@ -202,7 +201,7 @@ vm_map_kentry_alloc(size_t slab_size) + VM_MAP_KENTRY_SIZE)); for (i = 0; i < slab_size; i += PAGE_SIZE) { - page = vm_phys_alloc(0); + page = vm_page_alloc(0); if (page == NULL) panic("vm_map: no physical page for kentry cache"); @@ -229,9 +228,9 @@ vm_map_kentry_free(unsigned long va, size_t slab_size) for (i = 0; i < slab_size; i += PAGE_SIZE) { pa = pmap_extract(kernel_pmap, va + i); assert(pa != 0); - page = vm_phys_lookup_page(pa); + page = vm_page_lookup(pa); assert(page != NULL); - vm_phys_free(page, 0); + vm_page_free(page, 0); } pmap_kremove(va, va + slab_size); @@ -279,7 +278,7 @@ vm_map_kentry_setup(void) table_va = vm_map_kentry_entry.start + VM_MAP_KENTRY_SIZE; for (i = 0; i < nr_pages; i++) { - page = vm_phys_alloc(0); + page = vm_page_alloc(0); if (page == NULL) panic("vm_map: unable to allocate page for kentry table"); |