From 0a7f73980972caa1e6f9c4a0a3c31eb300ae2e64 Mon Sep 17 00:00:00 2001 From: Bob Liu Date: Tue, 23 Oct 2012 14:45:57 +0800 Subject: [PATCH] --- yaml --- r: 334825 b: refs/heads/master c: a1f102136538553a9488c713a336065ebb567542 h: refs/heads/master i: 334823: be8927b756e00e86733a8d0804fa9ce04c886d11 v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bf44adcacf8d..f0b2b1b5c3e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e97f3f918c27c68c092bdca7917266615aec62f +refs/heads/master: a1f102136538553a9488c713a336065ebb567542 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index bb90971182bd..b0012ab372a4 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/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)