diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-13 12:06:30 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-13 12:06:30 +0000 |
commit | 54a3a4d441e9eaceb86989f0b466e77815ab6129 (patch) | |
tree | eab08ab86a34f0a071467435b42f733d1af013cf /lib | |
parent | 7c9373fbcd0b29f6ccc28407c11ecd51cfa7a3c2 (diff) | |
parent | 3729ed7c6aa8c5b9eee8f832e4a246b8fa1d56b5 (diff) |
Merge tag 'v3.10.19' into linux-linaro-lsk
This is the 3.10.19 stable release
Diffstat (limited to 'lib')
-rw-r--r-- | lib/scatterlist.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/scatterlist.c b/lib/scatterlist.c index a1cf8cae60e7..3e7df38067ae 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c @@ -529,7 +529,8 @@ void sg_miter_stop(struct sg_mapping_iter *miter) miter->__offset += miter->consumed; miter->__remaining -= miter->consumed; - if (miter->__flags & SG_MITER_TO_SG) + if ((miter->__flags & SG_MITER_TO_SG) && + !PageSlab(miter->page)) flush_kernel_dcache_page(miter->page); if (miter->__flags & SG_MITER_ATOMIC) { |