The patch titled cciss-add-reboot-notifier-support-to-driver-fix has been added to the -mm tree. Its filename is cciss-add-reboot-notifier-support-to-driver-fix.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: cciss-add-reboot-notifier-support-to-driver-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Mike Miller <mike.miller@xxxxxx Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/cciss.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN drivers/block/cciss.c~cciss-add-reboot-notifier-support-to-driver-fix drivers/block/cciss.c --- a/drivers/block/cciss.c~cciss-add-reboot-notifier-support-to-driver-fix +++ a/drivers/block/cciss.c @@ -133,7 +133,7 @@ static struct board_type products[] = { #define MAX_CTLR_ORIG 8 static ctlr_info_t *hba[MAX_CTLR]; -static int notify_count=0; +static int notify_count; static void do_cciss_request(request_queue_t *q); static irqreturn_t do_cciss_intr(int irq, void *dev_id); @@ -3534,7 +3534,8 @@ static void __exit cciss_cleanup(void) int i; pci_unregister_driver(&cciss_pci_driver); - unregister_reboot_notifier(&cciss_notifier); + if (notify_count) + unregister_reboot_notifier(&cciss_notifier); /* double check that all controller entrys have been removed */ for (i = 0; i < MAX_CTLR; i++) { if (hba[i] != NULL) { _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are make-aout-executables-work-again-fix.patch sony-laptop-fix-uninitialised-variable.patch git-agpgart.patch git-cpufreq.patch git-drm.patch git-dvb.patch pvrusb-warning-fix.patch git-input.patch setstream-param-for-psmouse-tweak.patch git-libata-all.patch git-md-accel-vs-md.patch dmaengine-uninline-large-functions.patch git-mips-fixup.patch Fabric7-VIOC-driver-fixes.patch revert-drivers-net-tulip-dmfe-support-basic-carrier-detection.patch dmfe-add-support-for-suspend-resume-fix.patch sis900-warning-fixes.patch git-parisc.patch git-parisc-fixup.patch rm9000-serial-driver-tidy.patch git-pciseg.patch git-s390.patch revert-md-avoid-possible-bug_on-in-md-bitmap-handling-for-git-block.patch git-block-fixup.patch git-unionfs.patch after-before-x86_64-mm-mmconfig-share.patch throttle_vm_writeout-dont-loop-on-gfp_nofs-and-gfp_noio-allocations.patch smaps-add-clear_refs-file-to-clear-reference-fix.patch kvm-add-internal-filesystem-for-generating-inodes-tweak.patch fix-rmmod-read-write-races-in-proc-entries-fix.patch reduce-size-of-task_struct-on-64-bit-machines.patch mm-shrink-parent-dentries-when-shrinking-slab.patch cciss-add-reboot-notifier-support-to-driver-fix.patch call-cpu_chain-with-cpu_down_failed-if-cpu_down_prepare-failed-vs-reduce-size-of-task_struct-on-64-bit-machines.patch utrace-vs-reduce-size-of-task_struct-on-64-bit-machines.patch local_t-mips-extension-shrink-duplicated-mips-32-64-bits-functions-from-localh-fix.patch linux-kernel-markers-kconfig-menus-fix-4.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