diff options
Diffstat (limited to 'debian/patches/10_cdromlock.patch')
| -rw-r--r-- | debian/patches/10_cdromlock.patch | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/debian/patches/10_cdromlock.patch b/debian/patches/10_cdromlock.patch index eefde79..9d97c95 100644 --- a/debian/patches/10_cdromlock.patch +++ b/debian/patches/10_cdromlock.patch @@ -1,7 +1,7 @@ Index: linux/dev/glue/block.c =================================================================== --- linux/dev/glue/block.c.orig 2006-10-15 20:39:24.000000000 +0300 -+++ linux/dev/glue/block.c 2006-11-14 04:15:19.000000000 +0200 ++++ linux/dev/glue/block.c 2007-02-11 15:06:41.000000000 +0200 @@ -789,6 +789,7 @@ static struct block_data *open_list; extern struct device_emulation_ops linux_block_emulation_ops; @@ -64,7 +64,7 @@ Index: linux/dev/glue/block.c #define MAX_COPY (VM_MAP_COPY_PAGE_LIST_MAX << PAGE_SHIFT) /* Check block BN and size COUNT for I/O validity -@@ -1704,6 +1711,16 @@ device_get_status (void *d, dev_flavor_t +@@ -1704,6 +1711,17 @@ device_get_status (void *d, dev_flavor_t return D_SUCCESS; } @@ -73,15 +73,16 @@ Index: linux/dev/glue/block.c +device_no_senders (mach_no_senders_notification_t *ns) +{ + device_t dev; -+ -+ dev = (device_t) ((ipc_port_t) ns->not_header.msgh_remote_port) -> ip_kobject; ++ ++ dev = dev_port_lookup((ipc_port_t) ns->not_header.msgh_remote_port); ++ assert(dev); + device_close_forced (dev->emul_data, 1); +} + struct device_emulation_ops linux_block_emulation_ops = { NULL, -@@ -1719,7 +1736,7 @@ struct device_emulation_ops linux_block_ +@@ -1719,7 +1737,7 @@ struct device_emulation_ops linux_block_ device_get_status, NULL, NULL, @@ -90,17 +91,3 @@ Index: linux/dev/glue/block.c NULL, NULL }; -Index: i386/i386at/i386at_ds_routines.c -=================================================================== ---- i386/i386at/i386at_ds_routines.c.orig 2006-11-14 03:58:56.000000000 +0200 -+++ i386/i386at/i386at_ds_routines.c 2006-11-14 04:15:19.000000000 +0200 -@@ -232,7 +232,8 @@ ds_notify (mach_msg_header_t *msg) - mach_no_senders_notification_t *ns; - - ns = (mach_no_senders_notification_t *) msg; -- dev = (device_t) ns->not_header.msgh_remote_port; -+ dev = (device_t) ((ipc_port_t) ns->not_header.msgh_remote_port) -+ -> ip_kobject; - if (dev->emul_ops->no_senders) - (*dev->emul_ops->no_senders) (ns); - return TRUE; |