The patch titled Subject: cciss: bug fix to prevent cciss from loading in kdump crash kernel has been removed from the -mm tree. Its filename was cciss-bug-fix-to-prevent-cciss-from-loading-in-kdump-crash-kernel.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Mike Miller <mike.miller@xxxxxx> Subject: cciss: bug fix to prevent cciss from loading in kdump crash kernel By default the cciss driver supports all "older" HP Smart Array controllers and hpsa supports all controllers starting with the G6 family. There are module parameters that allow a user to override those defaults and use hpsa for any HP Smart Array controller. If the user does override the default behavior and uses hpsa for older controllers it is possible that cciss may try to load in a kdump crash kernel. This may happen if cciss is loaded first from the kdump initrd image. If cciss does load rather than hpsa and reset_devices is true we immediately call cciss_hard_reset_controller. This will result in a kernel panic and the core file cannot be created. This patch prevents cciss from trying to load in this scenario. Signed-off-by: Mike Miller <mike.miller@xxxxxx> Cc: Jens Axboe <axboe@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/cciss.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff -puN drivers/block/cciss.c~cciss-bug-fix-to-prevent-cciss-from-loading-in-kdump-crash-kernel drivers/block/cciss.c --- a/drivers/block/cciss.c~cciss-bug-fix-to-prevent-cciss-from-loading-in-kdump-crash-kernel +++ a/drivers/block/cciss.c @@ -4970,6 +4970,16 @@ static int cciss_init_one(struct pci_dev ctlr_info_t *h; unsigned long flags; + /* + * By default the cciss driver is used for all older HP Smart Array + * controllers. There are module paramaters that allow a user to + * override this behavior and instead use the hpsa SCSI driver. If + * this is the case cciss may be loaded first from the kdump initrd + * image and cause a kernel panic. So if reset_devices is true and + * cciss_allow_hpsa is set 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 linux-next.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