diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 23:07:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 23:07:55 +0200 |
| commit | 4a1f2b0fba89cdb3b2b1be99a7411bfd24d61be5 (patch) | |
| tree | e14158bdaf2a4723f98fc2411fb65416edb9f90b /mm | |
| parent | remap_file_pages: correctly handle the case of a NULL vm_ops pointer (diff) | |
| parent | lib/dma-debug.c: fix __hash_bucket_find() (diff) | |
| download | linux-4a1f2b0fba89cdb3b2b1be99a7411bfd24d61be5.tar.xz 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.c | 2 |
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) |