diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-31 16:58:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-31 16:58:23 -0700 |
| commit | 4f794ee8c40119366e0be45f9d49e7ff1a89b79b (patch) | |
| tree | 137eccc7d99cb71f4ae11568df0eaa909cbb7529 /lib | |
| parent | 358eec18243ac025b2eb0317ab52bd247e1b03c6 (diff) | |
| parent | 3d77b50c5874b7e923be946ba793644f82336b75 (diff) | |
Merge branch 'akpm' (fixes from Andrew Morton)
Merge four more fixes from Andrew Morton.
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
lib/scatterlist.c: don't flush_kernel_dcache_page on slab page
mm: memcg: fix test for child groups
mm: memcg: lockdep annotation for memcg OOM lock
mm: memcg: use proper memcg in limit bypass
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 a685c8a79578..d16fa295ae1d 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c @@ -577,7 +577,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) { |