summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-03 12:43:21 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-03 12:43:21 -0700
commit160acc2e899f26356bde92bc257253b7ca78f0c3 (patch)
treec60782685ac0fdf4b2d6278c4be639181dd65126 /block
parenta7e1e001f432d5960b929787a2a261cf5a7ddac5 (diff)
parentc46f2334c84c2b26baa64d42d75ddc5fab38c3dc (diff)
downloadblackbird-op-linux-160acc2e899f26356bde92bc257253b7ca78f0c3.tar.gz
blackbird-op-linux-160acc2e899f26356bde92bc257253b7ca78f0c3.zip
Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block
* 'sg' of git://git.kernel.dk/linux-2.6-block: [SG] Get rid of __sg_mark_end() cleanup asm/scatterlist.h includes SG: Make sg_init_one() use general table init functions
Diffstat (limited to 'block')
-rw-r--r--block/ll_rw_blk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 56f2646612e6..54fd38589674 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -1369,7 +1369,7 @@ new_segment:
} /* segments in rq */
if (sg)
- __sg_mark_end(sg);
+ sg_mark_end(sg);
return nsegs;
}
OpenPOWER on IntegriCloud