projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
block
/
blk-merge.c
diff --git
a/block/blk-merge.c
b/block/blk-merge.c
index
936a110
..
5f24482
100644
(file)
--- a/
block/blk-merge.c
+++ b/
block/blk-merge.c
@@
-143,7
+143,7
@@
new_segment:
* termination bit to avoid doing a full
* sg_init_table() in drivers for each command.
*/
-
(*sg)->page_link &= ~0x02
;
+
sg_unmark_end(*sg)
;
*sg = sg_next(*sg);
}