Commit 86a595f9 authored Oct 25, 2012 by Bob Liu Committed by Linus Torvalds Oct 25, 2012

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>

parent 29fc7c5a

mm/page_alloc.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5825,7 +5825,7 @@ int alloc_contig_range(unsigned long start, unsigned long end,
	ret = start_isolate_page_range(pfn_max_align_down(start),		ret = start_isolate_page_range(pfn_max_align_down(start),
	pfn_max_align_up(end), migratetype);		pfn_max_align_up(end), migratetype);
	if (ret)		if (ret)
	goto done;		return ret;

	ret = __alloc_contig_migrate_range(&cc, start, end);		ret = __alloc_contig_migrate_range(&cc, start, end);
	if (ret)		if (ret)