diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-10-15 07:05:06 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-10-15 07:05:18 +0200 |
commit | 426ee9e3bbc478ed9c0a079a4270f6095f0eb975 (patch) | |
tree | d8f295e2e516a61b2ab8ccb49f5b1d9fb67979bd /mm/bounce.c | |
parent | b7af41a1bc255c0098c37a4bcf5c7e5e168ce875 (diff) | |
parent | 61e6cfa80de5760bbe406f4e815b7739205754d2 (diff) | |
download | linux-426ee9e3bbc478ed9c0a079a4270f6095f0eb975.tar.bz2 |
Merge tag 'v3.12-rc5' into perf/core
Merge Linux v3.12-rc5, to pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/bounce.c')
-rw-r--r-- | mm/bounce.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/bounce.c b/mm/bounce.c index c9f0a4339a7d..5a7d58fb883b 100644 --- a/mm/bounce.c +++ b/mm/bounce.c @@ -204,6 +204,8 @@ static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig, struct bio_vec *to, *from; unsigned i; + if (force) + goto bounce; bio_for_each_segment(from, *bio_orig, i) if (page_to_pfn(from->bv_page) > queue_bounce_pfn(q)) goto bounce; |