summaryrefslogtreecommitdiff
path: root/vm
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2008-12-01 22:04:15 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-06-18 00:27:21 +0200
commit4bdef12bf49e8712cb6b9104b14d7b4d565e6ec1 (patch)
tree314b5da00d15009e863d8f1077c4464dbb62e8d7 /vm
parent4276d54c0037552d74b4ef6840783f905d3dd6c4 (diff)
2008-11-15 Shakthi Kannan <shakshurd@gmail.com>
* device/ds_routines.h (device_reference, device_deallocate): Add function prototypes. * kern/task.c (task_create): Moved unused i variable inside FAST_TAS. * vm/vm_map.h (vm_map_copy_page_discard): Add function prototype. * vm/vm_kern.c (projected_buffer_deallocate): Give &map->hdr instead of map to _vm_map_clip_start and _vm_map_clip_end functions. 2008-12-01 Samuel Thibault <samuel.thibault@ens-lyon.org> * device/device_emul.h (device_emulation_ops): Turn back reference, dealloc, dev_to_port, write_trap and writev_trap into taking a void*, as they do not always take a mach_device_t. * device/ds_routines.c (mach_device_emulation_ops): Cast mach_device_reference, mach_device_deallocate, mach_convert_device_to_port, device_write_trap and device_writev_trap to (void*) to make them accept a void* argument. * linux/pcmcia-cs/glue/ds.c (device_deallocate): Rename function into... (ds_device_deallocate): ... this. (dev_to_port): Call ds_device_deallocate instead of device_deallocate. (linux_pcmcia_emulation_ops): Use ds_device_deallocate instead of device_deallocate, cast mach_device_reference to (void*) to make it accept a void* argument.
Diffstat (limited to 'vm')
-rw-r--r--vm/vm_kern.c4
-rw-r--r--vm/vm_map.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/vm/vm_kern.c b/vm/vm_kern.c
index f29a014..dc7f7e4 100644
--- a/vm/vm_kern.c
+++ b/vm/vm_kern.c
@@ -269,9 +269,9 @@ projected_buffer_deallocate(map, start, end)
/*Prepare for deallocation*/
if (entry->vme_start < start)
- _vm_map_clip_start(map, entry, start);
+ _vm_map_clip_start(&map->hdr, entry, start);
if (entry->vme_end > end)
- _vm_map_clip_end(map, entry, end);
+ _vm_map_clip_end(&map->hdr, entry, end);
if (map->first_free == entry) /*Adjust first_free hint*/
map->first_free = entry->vme_prev;
entry->projected_on = 0; /*Needed to allow deletion*/
diff --git a/vm/vm_map.h b/vm/vm_map.h
index 8961e1b..1b8423e 100644
--- a/vm/vm_map.h
+++ b/vm/vm_map.h
@@ -414,6 +414,7 @@ extern kern_return_t vm_map_copy_overwrite(vm_map_t, vm_offset_t,
vm_map_copy_t, boolean_t);
/* Discard a copy without using it */
extern void vm_map_copy_discard(vm_map_copy_t);
+extern void vm_map_copy_page_discard(vm_map_copy_t);
extern vm_map_copy_t vm_map_copy_copy(vm_map_copy_t);
/* Page list continuation version of previous */
extern kern_return_t vm_map_copy_discard_cont(vm_map_copyin_args_t,