From 5ad2b8edae03649c6b2c55031c8e701c49e9bc76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Thu, 7 Oct 2004 15:15:08 +0000
Subject: [PATCH] Added exec() support function vm_delete_areas(); factored
 that code out of vm_delete_aspace() (which now calls it). Fixed some return
 types.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9248 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kernel/core/vm/vm.c | 53 +++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/src/kernel/core/vm/vm.c b/src/kernel/core/vm/vm.c
index 096770ab07..5c32a7e316 100755
--- a/src/kernel/core/vm/vm.c
+++ b/src/kernel/core/vm/vm.c
@@ -1827,11 +1827,36 @@ vm_create_aspace(const char *name, addr_t base, addr_t size, bool kernel)
 }
 
 
-int
+status_t
+vm_delete_areas(struct vm_address_space *aspace)
+{
+	vm_region *area;
+	vm_region *next;
+
+	TRACE(("vm_delete_areas: called on aspace 0x%lx\n", aspace->id));
+
+	// delete all the regions in this aspace
+
+	for (area = aspace->virtual_map.region_list; area; area = next) {
+		next = area->aspace_next;
+
+		if (area->id == RESERVED_REGION_ID) {
+			// just remove it
+			free(area);
+			continue;
+		}
+
+		// decrement the ref on this region, may actually push the ref < 0, but that's okay
+		_vm_put_region(area, true);
+	}
+
+	return B_OK;
+}
+
+
+status_t
 vm_delete_aspace(aspace_id aid)
 {
-	vm_region *region;
-	vm_region *next;
 	vm_address_space *aspace;
 
 	aspace = vm_get_aspace_by_id(aid);
@@ -1851,21 +1876,7 @@ vm_delete_aspace(aspace_id aid)
 	}
 	aspace->state = VM_ASPACE_STATE_DELETION;
 
-	// delete all the regions in this aspace
-	region = aspace->virtual_map.region_list;
-	while (region) {
-		next = region->aspace_next;
-		
-		if (region->id == RESERVED_REGION_ID) {
-			// just remove it
-			free(region);
-			region = next;
-			continue;
-		}
-		// decrement the ref on this region, may actually push the ref < 0, but that's okay
-		_vm_put_region(region, true);
-		region = next;
-	}
+	vm_delete_areas(aspace);
 
 	// unlock
 	release_sem_etc(aspace->virtual_map.sem, WRITE_COUNT, 0);
@@ -1990,7 +2001,7 @@ create_preloaded_image_areas(struct preloaded_image *image)
 }
 
 
-int
+status_t
 vm_init(kernel_args *ka)
 {
 	int err = 0;
@@ -2105,7 +2116,7 @@ vm_init(kernel_args *ka)
 }
 
 
-int
+status_t
 vm_init_postsem(kernel_args *ka)
 {
 	vm_region *region;
@@ -2129,7 +2140,7 @@ vm_init_postsem(kernel_args *ka)
 }
 
 
-int
+status_t
 vm_init_postthread(kernel_args *ka)
 {
 	vm_page_init_postthread(ka);