convert schedule_timeout to msleep in cciss.c
Subsystems (2)
PATCH 1/1 convert schedule_timeout to msleep in cciss.c
G'day list
I was doing some more grepping for schedule_timeout without HZ and found one in cciss.c.
Now I found a patch from Nish
http://lists.osdl.org/mailman/htdig/kernel-janitors/2005-February/003637.html
that was ack'd
http://lists.osdl.org/mailman/htdig/kernel-janitors/2005-February/003638.html
That contained a fix, but does not seem to have been applied.
Now Nish posted another patch
http://lists.osdl.org/mailman/htdig/kernel-janitors/2004-September/001849.html
that does seem to be in the KJ patch set, but doesn't fix the second schedule_timeout().
So I figure it should either be converted to HZ relative or to msleep(). Here is a patch to do the later.
compile tested on allyesconfig.
Convert schedule_timeout to msleep in cciss.c
block/cciss.c renamed from block/cciss.c.orig +1 -2
@@ -2912,8 +2912,7 @@ static int cciss_pci_init(ctlr_info_t *cif (!(readl (c->vaddr +SA5_DOORBELL ) & CFGTBL_ChangeReq))break ;/* delay and try again */ -set_current_state (TASK_INTERRUPTIBLE ); -schedule_timeout (10 ); +msleep (100 ); }#ifdef CCISS_DEBUG
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Quoted 6 lines · Darren Jenkins
G'day list
I was doing some more grepping for
schedule_timeoutwithout HZ and found one incciss.c.Now I found a patch from Nish
Would have been good to Cc me ;)
Quoted 10 lines
http://lists.osdl.org/mailman/htdig/kernel-janitors/2005-February/003637.html
that was ack'd
http://lists.osdl.org/mailman/htdig/kernel-janitors/2005-February/003638.htmlThat contained a fix, but does not seem to have been applied.
Now Nish posted another patch
http://lists.osdl.org/mailman/htdig/kernel-janitors/2004-September/001849.html
that does seem to be in the KJ patch set, but doesn't fix the secondschedule_timeout().
Keep in mind, these were obviously submitted in the opposite order. The simplest fix is for Alexey to drop the 2004-September patch and then pick-up the Acked-by-Maintainer version from 2005-February.
Alexey, is that ok by you?
Once he responds, we can decide if your patch is necessary or not.
Thanks,
Nish
Signature · 6 lines
Nishanth Aravamudan <[email protected]> IBM Linux Technology Center _______________________________________________ Kernel-janitors mailing list [email protected] https://lists.osdl.org/mailman/listinfo/kernel-janitors
G'day Nish
Quoted 14 lines · Nishanth Aravamudan
Quoted 6 lines · Darren Jenkins
G'day list
I was doing some more grepping for
schedule_timeoutwithout HZ and found one incciss.c.Now I found a patch from Nish
Would have been good to Cc me ;)
Quoted 8 lines
Quoted 6 lines
That contained a fix, but does not seem to have been applied.
Now Nish posted another patch
http://lists.osdl.org/mailman/htdig/kernel-janitors/2004-September/001849.html
that does seem to be in the KJ patch set, but doesn't fix the secondschedule_timeout().Keep in mind, these were obviously submitted in the opposite order. The
Actually I didn't notice the reverse order thing.
It makes a lot more sense now.
Quoted 2 lines
simplest fix is for Alexey to drop the 2004-September patch and then pick-up the Acked-by-Maintainer version from 2005-February.
Yep, either that or to get your patch upstream. It was Acked.
Quoted 3 lines
Alexey, is that ok by you?
Once he responds, we can decide if your patch is necessary or not.
Seems like you have it covered. :)
Quoted 2 lines
Thanks,
Nish
Darren J.
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors