From 4050d7ce97e2b826af06c6fc4bfa8da2a71218c7 Mon Sep 17 00:00:00 2001
From: Wen Congyang <wency@cn.fujitsu.com>
Date: Wed, 11 Jul 2012 14:02:31 -0700
Subject: [PATCH] --- yaml --- r: 311830 b: refs/heads/master c:
 41b9e2d7ec3f618fd076cb3466edd0a8ebabae5a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 337096282f00..5270dc980f31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 213ab3f9fcfc1ba471906a4f2c24d7b21370c859
+refs/heads/master: 41b9e2d7ec3f618fd076cb3466edd0a8ebabae5a
diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c
index 0d7e3ec8e0f3..427bb291dd0f 100644
--- a/trunk/mm/memory_hotplug.c
+++ b/trunk/mm/memory_hotplug.c
@@ -618,7 +618,7 @@ int __ref add_memory(int nid, u64 start, u64 size)
 		pgdat = hotadd_new_pgdat(nid, start);
 		ret = -ENOMEM;
 		if (!pgdat)
-			goto out;
+			goto error;
 		new_pgdat = 1;
 	}