diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-23 22:38:12 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-23 22:38:12 +0000 |
| commit | 755d3ab9a030abfad4d152c07400388f8d618540 (patch) | |
| tree | b8bce07270886f0d45f9c032b4c5615bd9d640ef /eth-multiplexer | |
| parent | 9d7e429e251bf6deb7dda41b4d3434d3e5663428 (diff) | |
| parent | 55dbe0445180b7b6755ad014a6ee66f49da7f23d (diff) | |
Merge branch 'upstream-merged'
Diffstat (limited to 'eth-multiplexer')
| -rw-r--r-- | eth-multiplexer/device_impl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eth-multiplexer/device_impl.c b/eth-multiplexer/device_impl.c index 953fca70..459d9c4c 100644 --- a/eth-multiplexer/device_impl.c +++ b/eth-multiplexer/device_impl.c @@ -156,7 +156,7 @@ ds_device_write (device_t device, mach_port_t reply_port, vdev_portclass); if (vdev == NULL) { - vm_deallocate (mach_task_self (), data, datalen); + vm_deallocate (mach_task_self (), (vm_address_t) data, datalen); return D_NO_SUCH_DEVICE; } /* The packet is forwarded to all virtual interfaces and @@ -168,7 +168,7 @@ ds_device_write (device_t device, mach_port_t reply_port, data, datalen, bytes_written); /* The data in device_write() is transmifered out of line, * so the server-side function has to deallocate it. */ - vm_deallocate (mach_task_self (), data, datalen); + vm_deallocate (mach_task_self (), (vm_address_t) data, datalen); ports_port_deref (vdev); return ret; } |
