diff --git a/headers/private/kernel/vm.h b/headers/private/kernel/vm.h index 967db7c51b..e85492a10b 100644 --- a/headers/private/kernel/vm.h +++ b/headers/private/kernel/vm.h @@ -98,28 +98,28 @@ void permit_page_faults(void); void forbid_page_faults(void); // private kernel only extension (should be moved somewhere else): -area_id create_area_etc(struct team *team, const char *name, void **address, +area_id create_area_etc(struct team *team, const char *name, void **address, uint32 addressSpec, uint32 size, uint32 lock, uint32 protection); status_t delete_area_etc(struct team *team, area_id area); status_t vm_unreserve_address_range(team_id team, void *address, addr_t size); -status_t vm_reserve_address_range(team_id team, void **_address, +status_t vm_reserve_address_range(team_id team, void **_address, uint32 addressSpec, addr_t size, uint32 flags); -area_id vm_create_anonymous_area(team_id team, const char *name, void **address, +area_id vm_create_anonymous_area(team_id team, const char *name, void **address, uint32 addressSpec, addr_t size, uint32 wiring, uint32 protection); -area_id vm_map_physical_memory(team_id team, const char *name, void **address, +area_id vm_map_physical_memory(team_id team, const char *name, void **address, uint32 addressSpec, addr_t size, uint32 protection, addr_t phys_addr); -area_id vm_map_file(team_id aid, const char *name, void **address, - uint32 addressSpec, addr_t size, uint32 protection, uint32 mapping, +area_id vm_map_file(team_id aid, const char *name, void **address, + uint32 addressSpec, addr_t size, uint32 protection, uint32 mapping, const char *path, off_t offset); struct vm_cache *vm_area_get_locked_cache(struct vm_area *area); void vm_area_put_locked_cache(struct vm_cache *cache); -area_id vm_create_null_area(team_id team, const char *name, void **address, +area_id vm_create_null_area(team_id team, const char *name, void **address, uint32 addressSpec, addr_t size); -area_id vm_copy_area(team_id team, const char *name, void **_address, +area_id vm_copy_area(team_id team, const char *name, void **_address, uint32 addressSpec, uint32 protection, area_id sourceID); -area_id vm_clone_area(team_id team, const char *name, void **address, - uint32 addressSpec, uint32 protection, uint32 mapping, +area_id vm_clone_area(team_id team, const char *name, void **address, + uint32 addressSpec, uint32 protection, uint32 mapping, area_id sourceArea); status_t vm_delete_area(team_id teamID, area_id areaID); status_t vm_create_vnode_cache(struct vnode *vnode, struct vm_cache **_cache); @@ -138,7 +138,7 @@ status_t vm_map_page(struct vm_area *area, struct vm_page *page, addr_t address, status_t vm_get_physical_page(addr_t paddr, addr_t *vaddr, uint32 flags); status_t vm_put_physical_page(addr_t vaddr); -off_t vm_get_available_memory(void); +off_t vm_available_memory(void); // user syscalls area_id _user_create_area(const char *name, void **address, uint32 addressSpec, @@ -151,10 +151,10 @@ area_id _user_find_area(const char *name); status_t _user_get_area_info(area_id area, area_info *info); status_t _user_get_next_area_info(team_id team, int32 *cookie, area_info *info); status_t _user_resize_area(area_id area, size_t newSize); -area_id _user_transfer_area(area_id area, void **_address, uint32 addressSpec, +area_id _user_transfer_area(area_id area, void **_address, uint32 addressSpec, team_id target); status_t _user_set_area_protection(area_id area, uint32 newProtection); -area_id _user_clone_area(const char *name, void **_address, uint32 addressSpec, +area_id _user_clone_area(const char *name, void **_address, uint32 addressSpec, uint32 protection, area_id sourceArea); status_t _user_reserve_heap_address_range(addr_t* userAddress, uint32 addressSpec, addr_t size); diff --git a/src/system/kernel/vm/vm.cpp b/src/system/kernel/vm/vm.cpp index a323a8d2a5..5c1b324808 100644 --- a/src/system/kernel/vm/vm.cpp +++ b/src/system/kernel/vm/vm.cpp @@ -4394,7 +4394,7 @@ vm_get_physical_page(addr_t paddr, addr_t *_vaddr, uint32 flags) off_t -vm_get_available_memory(void) +vm_available_memory(void) { return sAvailableMemory; } diff --git a/src/system/kernel/vm/vm_page.cpp b/src/system/kernel/vm/vm_page.cpp index 0d0ba5378b..eedba0dfb9 100644 --- a/src/system/kernel/vm/vm_page.cpp +++ b/src/system/kernel/vm/vm_page.cpp @@ -1693,7 +1693,7 @@ status_t vm_page_allocate_pages(int pageState, vm_page **pages, uint32 numPages) { uint32 i; - + for (i = 0; i < numPages; i++) { pages[i] = vm_page_allocate_page(pageState, false); if (pages[i] == NULL) { @@ -1874,7 +1874,7 @@ vm_page_num_pages(void) size_t vm_page_num_available_pages(void) { - return vm_get_available_memory() / B_PAGE_SIZE; + return vm_available_memory() / B_PAGE_SIZE; }