---

yaml --- r: 164384 b: refs/heads/master c: b259fbd h: refs/heads/master v: v3
git-mirror · Sep 22, 2009 · 3b5c689 · 3b5c689
1 parent b364ffd
commit 3b5c689
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b02108ac1b3354a22b0d83c684797692efdc395
+refs/heads/master: b259fbde0a86085264c89aa2ce9c6e35792a1aad
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -1771,14 +1771,14 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
 
 	wake_all_kswapd(order, zonelist, high_zoneidx);
 
+restart:
 	/*
 	 * OK, we're below the kswapd watermark and have kicked background
 	 * reclaim. Now things get more complex, so set up alloc_flags according
 	 * to how we want to proceed.
 	 */
 	alloc_flags = gfp_to_alloc_flags(gfp_mask);
 
-restart:
 	/* This is the last chance, in general, before the goto nopage. */
 	page = get_page_from_freelist(gfp_mask, nodemask, order, zonelist,
 			high_zoneidx, alloc_flags & ~ALLOC_NO_WATERMARKS,