From: Gavin Shan <shangw@linux.vnet.ibm.com>
Date: Mon, 8 Oct 2012 23:29:27 +0000 (-0700)
Subject: mm/vmscan: fix error number for failed kthread
X-Git-Tag: MMI-PSA29.97-13-9~15778^2~140
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d5dc0ad928fb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

mm/vmscan: fix error number for failed kthread

Fix the return value while failing to create the kswapd kernel thread.
Also, the error message is prioritized as KERN_ERR.

Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/vmscan.c b/mm/vmscan.c
index f6fdae7a8d4c..d16bf5a53266 100644
--- a/mm/vmscan.c
+++ b/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;
 }