On Wed, 2011-04-13 at 13:23 +0200, Jens Axboe wrote:

We definitely only want to do it on going to sleep, not preempt events.
So if you are fine with this change, then lets please do that.

Here's the Acked-by: Peter Zijlstra [off-list ref], that goes
with it ;-)

Linus, I've got a few other things queued up in the area, I'll add this
and send them off soon. Or feel free to add this one yourself, since you
already did it. 

Right, please send it onwards or have Linus commit it himself and I'll
cook up a patch clarifying the rq->lock'ing mess around there.