summaryrefslogtreecommitdiff
path: root/mm/bounce.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-10-08 07:14:51 (GMT)
committerIngo Molnar <mingo@elte.hu>2010-10-08 07:15:00 (GMT)
commit153db80f8cf74e8700cac96305b6c0b92918f17c (patch)
treec2afb28e7b3f4fbf0aacd9edd39d7f895321ca0c /mm/bounce.c
parent5fd03ddab7fdbc44bfb2d183a4531c26a8dbca5a (diff)
parentcb655d0f3d57c23db51b981648e452988c0223f9 (diff)
downloadlinux-153db80f8cf74e8700cac96305b6c0b92918f17c.tar.xz
Merge commit 'v2.6.36-rc7' into core/memblock
Merge reason: Update from -rc3 to -rc7. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm/bounce.c')
-rw-r--r--mm/bounce.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/bounce.c b/mm/bounce.c
index 13b6dad..1481de6 100644
--- a/mm/bounce.c
+++ b/mm/bounce.c
@@ -116,8 +116,8 @@ static void copy_to_high_bio_irq(struct bio *to, struct bio *from)
*/
vfrom = page_address(fromvec->bv_page) + tovec->bv_offset;
- flush_dcache_page(tovec->bv_page);
bounce_copy_vec(tovec, vfrom);
+ flush_dcache_page(tovec->bv_page);
}
}