From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751079AbWEITwU (ORCPT ); Tue, 9 May 2006 15:52:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751102AbWEITwU (ORCPT ); Tue, 9 May 2006 15:52:20 -0400 Received: from dsl093-016-182.msp1.dsl.speakeasy.net ([66.93.16.182]:31395 "EHLO cinder.waste.org") by vger.kernel.org with ESMTP id S1751079AbWEITvu (ORCPT ); Tue, 9 May 2006 15:51:50 -0400 From: Matt Mackall To: Andrew Morton X-PatchBomber: http://selenic.com/scripts/mailpatches Cc: linux-kernel@vger.kernel.org, iss_storagedev@hp.com In-Reply-To: <2.628477917@selenic.com> Message-Id: <4.628477917@selenic.com> Subject: [PATCH 3/6] random: Make CCISS use add_disk_randomness Date: Tue, 09 May 2006 14:50:25 -0500 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Make CCISS use add_disk_randomness Disk devices should use the add_disk_randomness API rather than SA_SAMPLE_RANDOM. Signed-off-by: Matt Mackall Index: 2.6/drivers/block/cciss.c =================================================================== --- 2.6.orig/drivers/block/cciss.c 2006-05-02 17:29:26.000000000 -0500 +++ 2.6/drivers/block/cciss.c 2006-05-03 11:22:54.000000000 -0500 @@ -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;