---

yaml --- r: 126815 b: refs/heads/master c: 0c910d2 h: refs/heads/master i: 126813: 13885a7 126811: e882394 126807: 67ad996 126799: a527c6a 126783: 82ce80a v: v3
git-mirror · Jan 6, 2009 · 2e80a37 · 2e80a37
1 parent 3f48611
commit 2e80a37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9be28ea9110c596a05bd2d56afa94251bd19818
+refs/heads/master: 0c910d289567163dbe40ccc174b36afd1c7723bd
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -6970,7 +6970,7 @@ static int init_rootdomain(struct root_domain *rd, bool bootmem)
 	}
 
 	if (!alloc_cpumask_var(&rd->span, GFP_KERNEL))
-		goto free_rd;
+		goto out;
 	if (!alloc_cpumask_var(&rd->online, GFP_KERNEL))
 		goto free_span;
 	if (!alloc_cpumask_var(&rd->rto_mask, GFP_KERNEL))
@@ -6986,8 +6986,7 @@ static int init_rootdomain(struct root_domain *rd, bool bootmem)
 	free_cpumask_var(rd->online);
 free_span:
 	free_cpumask_var(rd->span);
-free_rd:
-	kfree(rd);
+out:
 	return -ENOMEM;
 }