diff options
author | Bob Liu <lliubbo@gmail.com> | 2012-10-25 22:37:56 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-25 23:37:52 +0200 |
commit | 86a595f961360c9c31d00fb111dd09e5d5ba9a40 (patch) | |
tree | 52dd9b68f4ff194f8e466d11934d0bbe545c75d7 /mm/page_alloc.c | |
parent | rbtree: include linux/compiler.h for definition of __always_inline (diff) | |
download | linux-86a595f961360c9c31d00fb111dd09e5d5ba9a40.tar.xz linux-86a595f961360c9c31d00fb111dd09e5d5ba9a40.zip |
mm/page_alloc.c:alloc_contig_range(): return early for err path
If start_isolate_page_range() failed, unset_migratetype_isolate() has been
done inside it.
Signed-off-by: Bob Liu <lliubbo@gmail.com>
Cc: Ni zhan Chen <nizhan.chen@gmail.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r-- | mm/page_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index bb90971182bd..b0012ab372a4 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5825,7 +5825,7 @@ int alloc_contig_range(unsigned long start, unsigned long end, ret = start_isolate_page_range(pfn_max_align_down(start), pfn_max_align_up(end), migratetype); if (ret) - goto done; + return ret; ret = __alloc_contig_migrate_range(&cc, start, end); if (ret) |