From 8d258f26709d94b0e02125feedb908e6f4af63c6 Mon Sep 17 00:00:00 2001
From: Mel Gorman <mel@csn.ul.ie>
Date: Wed, 11 Nov 2009 14:26:14 -0800
Subject: [PATCH] --- yaml --- r: 168564 b: refs/heads/master c:
 cc4a6851466039a8a688c843962a05689059ff3b h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 714c34b7b53d..989f3ef39e33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0c9065324b7c1242b97b27a1407da18471b9b23
+refs/heads/master: cc4a6851466039a8a688c843962a05689059ff3b
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index cdcedf661616..250d0552a92d 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1817,9 +1817,9 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
 	if (NUMA_BUILD && (gfp_mask & GFP_THISNODE) == GFP_THISNODE)
 		goto nopage;
 
+restart:
 	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