summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-19 14:07:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-19 14:07:55 -0700
commit4a1f2b0fba89cdb3b2b1be99a7411bfd24d61be5 (patch)
treee14158bdaf2a4723f98fc2411fb65416edb9f90b /mm
parentdeb521c44fa529b24cc78a64702757a683f82487 (diff)
parentfe73fbe1c5eda709084dedb66cbdd4b86826cce7 (diff)
downloadblackbird-op-linux-4a1f2b0fba89cdb3b2b1be99a7411bfd24d61be5.tar.gz
blackbird-op-linux-4a1f2b0fba89cdb3b2b1be99a7411bfd24d61be5.zip
Merge branch 'akpm' (Fixes from Andrew)
Merge misc fixes from Andrew Morton: "Seven fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (7 patches) lib/dma-debug.c: fix __hash_bucket_find() mm: compaction: correct the nr_strict va isolated check for CMA firmware/memmap: avoid type conflicts with the generic memmap_init() pidns: remove recursion from free_pid_ns() drivers/video/backlight/lm3639_bl.c: return proper error in lm3639_bled_mode_store() error paths kernel/sys.c: fix stack memory content leak via UNAME26 linux/coredump.h needs asm/siginfo.h
Diffstat (limited to 'mm')
-rw-r--r--mm/compaction.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/compaction.c b/mm/compaction.c
index 2c4ce17651d8..9eef55838fca 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -346,7 +346,7 @@ static unsigned long isolate_freepages_block(struct compact_control *cc,
* pages requested were isolated. If there were any failures, 0 is
* returned and CMA will fail.
*/
- if (strict && nr_strict_required != total_isolated)
+ if (strict && nr_strict_required > total_isolated)
total_isolated = 0;
if (locked)
OpenPOWER on IntegriCloud