i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disabled B_USER_CLONEABLE_AREA for now - maybe this should be handled via kernel settings later.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13372 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-06-30 23:14:13 +00:00
parent 8bc4973900
commit e970b839a0
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/vm/vm.cpp
+9 -7
View File
@@ -1185,12 +1185,18 @@ vm_clone_area(aspace_id aid, const char *name, void **address, uint32 addressSpe
return B_BAD_VALUE; return B_BAD_VALUE;
} }
// ToDo: for now, B_USER_CLONEABLE is disabled, until all drivers
// have been adapted. Maybe it should be part of the kernel settings,
// anyway (so that old drivers can always work).
#if 0
if (sourceArea->aspace == kernel_aspace && aspace != kernel_aspace if (sourceArea->aspace == kernel_aspace && aspace != kernel_aspace
&& !(sourceArea->protection & B_USER_CLONEABLE_AREA)) { && !(sourceArea->protection & B_USER_CLONEABLE_AREA)) {
// kernel areas must not be cloned in userland, unless explicitly // kernel areas must not be cloned in userland, unless explicitly
// declared user-cloneable upon construction // declared user-cloneable upon construction
status = B_NOT_ALLOWED; status = B_NOT_ALLOWED;
} else { } else
#endif
{
vm_cache_acquire_ref(sourceArea->cache_ref, true); vm_cache_acquire_ref(sourceArea->cache_ref, true);
status = map_backing_store(aspace, sourceArea->cache_ref->cache->store, address, status = map_backing_store(aspace, sourceArea->cache_ref->cache->store, address,
sourceArea->cache_offset, sourceArea->size, addressSpec, sourceArea->wiring, sourceArea->cache_offset, sourceArea->size, addressSpec, sourceArea->wiring,
@@ -1938,11 +1944,9 @@ vm_area_for(aspace_id aid, addr_t address)
static void static void
unmap_and_free_physical_pages(vm_translation_map *map, addr_t start, addr_t end) unmap_and_free_physical_pages(vm_translation_map *map, addr_t start, addr_t end)
{ {
addr_t current = start; // free all physical pages in the specified range
// free all physical pages behind the specified range for (addr_t current = start; current < end; current += B_PAGE_SIZE) {
while (current < end) {
addr_t physicalAddress; addr_t physicalAddress;
uint32 flags; uint32 flags;
@@ -1951,8 +1955,6 @@ unmap_and_free_physical_pages(vm_translation_map *map, addr_t start, addr_t end)
if (page != NULL) if (page != NULL)
vm_page_set_state(page, PAGE_STATE_FREE); vm_page_set_state(page, PAGE_STATE_FREE);
} }
current += B_PAGE_SIZE;
} }
// unmap the memory // unmap the memory