From f586366c47bcf1cebd3792d0026b568113a49767 Mon Sep 17 00:00:00 2001
From: Gavin Shan <shangw@linux.vnet.ibm.com>
Date: Mon, 8 Oct 2012 16:29:27 -0700
Subject: [PATCH] --- yaml --- r: 332358 b: refs/heads/master c:
 d5dc0ad928fb9e972001e552597fd0b794863f34 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2ca7bdb1be37..407e8d0068e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0f3c3f78da29b114e7c1c68019036559f715948
+refs/heads/master: d5dc0ad928fb9e972001e552597fd0b794863f34
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index f6fdae7a8d4c..d16bf5a53266 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -3126,9 +3126,9 @@ int kswapd_run(int nid)
 	if (IS_ERR(pgdat->kswapd)) {
 		/* failure at boot is fatal */
 		BUG_ON(system_state == SYSTEM_BOOTING);
-		printk("Failed to start kswapd on node %d\n",nid);
 		pgdat->kswapd = NULL;
-		ret = -1;
+		pr_err("Failed to start kswapd on node %d\n", nid);
+		ret = PTR_ERR(pgdat->kswapd);
 	}
 	return ret;
 }