---

yaml --- r: 356510 b: refs/heads/master c: a864b9d h: refs/heads/master v: v3
git-mirror · Feb 24, 2013 · 5a0b95d · 5a0b95d
1 parent ae55311
commit 5a0b95d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41badc15cbad0350de34408c1b0c690f9df76d4b
+refs/heads/master: a864b9d06c71456470b3544fe4cc07bcdd29828d
diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c
@@ -901,8 +901,7 @@ int __ref add_memory(int nid, u64 start, u64 size)
 	/* rollback pgdat allocation and others */
 	if (new_pgdat)
 		rollback_node_hotadd(nid, pgdat);
-	if (res)
-		release_memory_resource(res);
+	release_memory_resource(res);
 
 out:
 	unlock_memory_hotplug();