The patch titled Subject: cciss: bug fix, prevent cciss from loading in kdump kernel has been added to the -mm tree. Its filename is cciss-bug-fix-prevent-cciss-from-loading-in-kdump-kernel.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Mike Miller <mike.miller@xxxxxx> Subject: cciss: bug fix, prevent cciss from loading in kdump kernel If hpsa is selected as the Smart Array driver cciss may try to load in the kdump kernel. When this happens kdump fails and a core file cannot be created. This patch prevents cciss from trying to load in this scenario. This effects primarily older Smart Array controllers. Signed-off-by: Mike Miller <mike.miller@xxxxxx> Cc: Jens Axboe <axboe@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/cciss.c | 6 ++++++ 1 file changed, 6 insertions(+) diff -puN drivers/block/cciss.c~cciss-bug-fix-prevent-cciss-from-loading-in-kdump-kernel drivers/block/cciss.c --- a/drivers/block/cciss.c~cciss-bug-fix-prevent-cciss-from-loading-in-kdump-kernel +++ a/drivers/block/cciss.c @@ -4960,6 +4960,12 @@ static int cciss_init_one(struct pci_dev ctlr_info_t *h; unsigned long flags; + /* + * if this is the kdump kernel and the user has set the flags to + * use hpsa rather than cciss just bail + */ + if ((reset_devices) && (cciss_allow_hpsa == 1)) + return -ENODEV; rc = cciss_init_reset_devices(pdev); if (rc) { if (rc != -ENOTSUPP) _ Patches currently in -mm which might be from mike.miller@xxxxxx are cciss-bug-fix-prevent-cciss-from-loading-in-kdump-kernel.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