---

yaml --- r: 311830 b: refs/heads/master c: 41b9e2d h: refs/heads/master v: v3
git-mirror · Jul 11, 2012 · 4050d7c · 4050d7c
1 parent 6cb4815
commit 4050d7c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 	}