From: Matt Mackall Disk devices should use add_disk_randomness rather than SA_SAMPLE_RANDOM Signed-off-by: Matt Mackall Cc: Signed-off-by: Andrew Morton --- drivers/block/cpqarray.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff -puN drivers/block/cpqarray.c~random-change-cpqarray-to-use-add_disk_randomness drivers/block/cpqarray.c --- devel/drivers/block/cpqarray.c~random-change-cpqarray-to-use-add_disk_randomness 2006-05-11 01:44:01.000000000 -0700 +++ devel-akpm/drivers/block/cpqarray.c 2006-05-11 01:44:01.000000000 -0700 @@ -408,8 +408,7 @@ static int cpqarray_register_ctlr( int i } hba[i]->access.set_intr_mask(hba[i], 0); if (request_irq(hba[i]->intr, do_ida_intr, - SA_INTERRUPT|SA_SHIRQ|SA_SAMPLE_RANDOM, - hba[i]->devname, hba[i])) + SA_INTERRUPT|SA_SHIRQ, hba[i]->devname, hba[i])) { printk(KERN_ERR "cpqarray: Unable to get irq %d for %s\n", hba[i]->intr, hba[i]->devname); @@ -1034,6 +1033,8 @@ static inline void complete_command(cmdl complete_buffers(cmd->rq->bio, ok); + add_disk_randomness(cmd->rq->rq_disk); + DBGPX(printk("Done with %p\n", cmd->rq);); end_that_request_last(cmd->rq, ok ? 1 : -EIO); } _