diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-16 20:16:41 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-16 20:16:41 (GMT) |
| commit | 381bd9517a7e611871694689c67901d189cf6a62 (patch) | |
| tree | 7f9492cbbb93039ef84722e518e2ca6e8ad0c364 /mm/bounce.c | |
| parent | 01b9e0418689951c6ae4ba3b221bc42f49eb6407 (diff) | |
| parent | f6bd03a746271f298aa5bfb6e049b245757efaed (diff) | |
| download | linux-fsl-qoriq-381bd9517a7e611871694689c67901d189cf6a62.tar.xz | |
Merge remote-tracking branch 'spi/topic/trivial' into spi-atmel
Conflicts (trivial overlapping cleanups):
drivers/spi/spi-atmel.c
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 c9f0a43..5a7d58f 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; |