diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-12-03 11:51:35 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-12-03 11:51:35 -0500 |
| commit | aa032e0bf724184a3acb7d7753bda611b871d050 (patch) | |
| tree | 6fe125d479ececd7ec3fcc0c3f13f31e65ca4540 /lib | |
| parent | 0d68db4a4e26e478739458720e4970b9824f47a2 (diff) | |
| parent | 66c8d27b7084ecd4d7d17dc7a69e6f993f5a2549 (diff) | |
Merge tag 'v3.2.53' into v3.2-rt
This is the 3.2.53 stable release
Conflicts:
init/main.c
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 181f3647818d..7a594cded867 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c @@ -419,7 +419,8 @@ void sg_miter_stop(struct sg_mapping_iter *miter) if (miter->addr) { miter->__offset += 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) { |