From 1e09fa3b1f5b0e43e7db534674fdc934872afc14 Mon Sep 17 00:00:00 2001
From: Xishi Qiu <qiuxishi@huawei.com>
Date: Wed, 17 Apr 2013 15:58:34 -0700
Subject: [PATCH] --- yaml --- r: 362598 b: refs/heads/master c:
 d72515b85a6583db131ec6032978e3c9d4291d95 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cf9bc86fb6a6..135efa10382e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12f267a20aecf8b84a2a9069b9011f1661c779b4
+refs/heads/master: d72515b85a6583db131ec6032978e3c9d4291d95
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 88c5fed8b9a4..669fba39be1a 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -3188,9 +3188,9 @@ int kswapd_run(int nid)
 	if (IS_ERR(pgdat->kswapd)) {
 		/* failure at boot is fatal */
 		BUG_ON(system_state == SYSTEM_BOOTING);
-		pgdat->kswapd = NULL;
 		pr_err("Failed to start kswapd on node %d\n", nid);
 		ret = PTR_ERR(pgdat->kswapd);
+		pgdat->kswapd = NULL;
 	}
 	return ret;
 }