All callers of __blk_run_queue are of the form

	spin_lock_irqsave(q->queue_lock, flags);
	__blk_run_queue(q);
	spin_unlock_irqrestore(q->queue_lock, flags);

Replace it with a blk_run_queue that does the locking itself.