The patch titled BODGE scsi misc module reference count checks with no MODULE_UNLOAD has been removed from the -mm tree. Its filename is bodge-scsi-misc-module-reference-count-checks-with-no-module_unload.patch This patch was dropped because it is obsolete ------------------------------------------------------ Subject: BODGE scsi misc module reference count checks with no MODULE_UNLOAD From: Andy Whitcroft <apw@xxxxxxxxxxxx> BODGE scsi misc module reference count checks with no MODULE_UNLOAD A quick bodge to try and get this to compile for testing. Signed-off-by: Andy Whitcroft <apw@xxxxxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/scsi/scsi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff -puN drivers/scsi/scsi.c~bodge-scsi-misc-module-reference-count-checks-with-no-module_unload drivers/scsi/scsi.c --- a/drivers/scsi/scsi.c~bodge-scsi-misc-module-reference-count-checks-with-no-module_unload +++ a/drivers/scsi/scsi.c @@ -876,7 +876,11 @@ void scsi_device_put(struct scsi_device #ifdef CONFIG_MODULE_UNLOAD /* The module refcount will be zero if scsi_device_get() * was called from a module removal routine */ - if (module && module_refcount(module) != 0) + if (module +#ifdef CONFIG_MODULE_UNLOAD + && module_refcount(module) != 0 +#endif + ) module_put(module); #endif put_device(&sdev->sdev_gendev); _ Patches currently in -mm which might be from apw@xxxxxxxxxxxx are i386-fix-flat-mode-numa-on-a-real-numa-system.patch bodge-scsi-misc-module-reference-count-checks-with-no-module_unload.patch add-__gfp_thisnode-to-avoid-fallback-to-other-nodes-and-ignore.patch add-__gfp_thisnode-to-avoid-fallback-to-other-nodes-and-ignore-fix.patch sys_move_pages-do-not-fall-back-to-other-nodes.patch guarantee-that-the-uncached-allocator-gets-pages-on-the-correct.patch introduce-mechanism-for-registering-active-regions-of-memory.patch have-power-use-add_active_range-and-free_area_init_nodes.patch have-x86-use-add_active_range-and-free_area_init_nodes.patch have-x86-use-add_active_range-and-free_area_init_nodes-fix.patch have-x86_64-use-add_active_range-and-free_area_init_nodes.patch have-ia64-use-add_active_range-and-free_area_init_nodes.patch account-for-memmap-and-optionally-the-kernel-image-as-holes.patch account-for-holes-that-are-outside-the-range-of-physical-memory.patch allow-an-arch-to-expand-node-boundaries.patch get-rid-of-zone_table.patch get-rid-of-zone_table-fix.patch optional-zone_dma-in-the-vm-tidy.patch avr32-kill-config_discontigmem-support-completely.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html