summaryrefslogtreecommitdiff
path: root/linux
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 /linux
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 'linux')
-rw-r--r--linux/pcmcia-cs/glue/ds.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/pcmcia-cs/glue/ds.c b/linux/pcmcia-cs/glue/ds.c
index 733e4b6..8f88b55 100644
--- a/linux/pcmcia-cs/glue/ds.c
+++ b/linux/pcmcia-cs/glue/ds.c
@@ -91,7 +91,7 @@ struct mach_socket_device {
static void
-device_deallocate(void *p)
+ds_device_deallocate(void *p)
{
mach_device_t device = (mach_device_t) p;
@@ -146,7 +146,7 @@ dev_to_port(void *d)
ipc_port_t port = ipc_port_make_send(dev->port);
- device_deallocate(dev);
+ ds_device_deallocate(dev);
return port;
}
@@ -441,8 +441,8 @@ device_get_status(void *d, dev_flavor_t req, dev_status_t arg,
struct device_emulation_ops linux_pcmcia_emulation_ops =
{
- mach_device_reference,
- device_deallocate,
+ (void*) mach_device_reference,
+ ds_device_deallocate,
dev_to_port,
device_open,
device_close,