From: Matt Mackall Disk devices should use the add_disk_randomness API rather than SA_SAMPLE_RANDOM. Signed-off-by: Matt Mackall Cc: Signed-off-by: Andrew Morton --- drivers/block/cciss.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/block/cciss.c~random-make-cciss-use-add_disk_randomness drivers/block/cciss.c --- devel/drivers/block/cciss.c~random-make-cciss-use-add_disk_randomness 2006-05-11 01:43:41.000000000 -0700 +++ devel-akpm/drivers/block/cciss.c 2006-05-11 01:43:41.000000000 -0700 @@ -1221,6 +1221,7 @@ static void cciss_softirq_done(struct re printk("Done with %p\n", rq); #endif /* CCISS_DEBUG */ + add_disk_randomness(rq->rq_disk); spin_lock_irqsave(&h->lock, flags); end_that_request_last(rq, rq->errors); cmd_free(h, cmd,1); @@ -3152,8 +3153,7 @@ static int __devinit cciss_init_one(stru /* make sure the board interrupts are off */ hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF); if( request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_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 "cciss: Unable to get irq %d for %s\n", hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname); goto clean2; _