Merge branch 'sglist-arch' into for-linus

This commit is contained in:
Jens Axboe 2007-10-16 12:29:34 +02:00
commit 3eed13fd93
110 changed files with 870 additions and 597 deletions

View file

@ -2569,6 +2569,7 @@ static void do_cciss_request(struct request_queue *q)
(int)creq->nr_sectors);
#endif /* CCISS_DEBUG */
memset(tmp_sg, 0, sizeof(tmp_sg));
seg = blk_rq_map_sg(q, creq, tmp_sg);
/* get the DMA records for the setup */