Messages in this thread Patch in this message | | | Date | Mon, 10 Jan 2005 12:13:07 -0800 | From | Nishanth Aravamudan <> | Subject | Re: [KJ] [announce] 2.6.10-bk13-kj |
| |
On Mon, Jan 10, 2005 at 05:47:03PM +0100, Domen Puncer wrote: > Patchset of 171 patches is at http://coderock.org/kj/2.6.10-bk13-kj/ > > Quick patch summary: about 30 new, 30 merged, 30 dropped. > Seems like most external trees are merged in -linus, so i'll start > (re)sending old patches.
<snip>
> msleep_interruptible-drivers_block_cciss.patch
Please consider replacing with the following patch:
Description: Use msleep() instead of schedule_timeout() to guarantee the task delays as expected. TASK_INTERRUPTIBLE is used currently, however signals / early returns from schedule_timeout() are not checked for. Thus msleep() is more appropriate.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.10-v/drivers/block/cciss.c 2004-12-24 13:35:39.000000000 -0800 +++ 2.6.10/drivers/block/cciss.c 2005-01-10 12:10:50.000000000 -0800 @@ -2430,8 +2430,7 @@ static int cciss_pci_init(ctlr_info_t *c scratchpad = readl(c->vaddr + SA5_SCRATCHPAD_OFFSET); if (scratchpad == CCISS_FIRMWARE_READY) break; - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(HZ / 10); /* wait 100ms */ + msleep(100); /* wait 100ms */ } if (scratchpad != CCISS_FIRMWARE_READY) { printk(KERN_WARNING "cciss: Board not ready. Timed out.\n"); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |