From 2e80a379c3ae7b7a43e1426049a27b51d774b0ad Mon Sep 17 00:00:00 2001 From: Li Zefan Date: Tue, 6 Jan 2009 17:39:06 +0800 Subject: [PATCH] --- yaml --- r: 126815 b: refs/heads/master c: 0c910d289567163dbe40ccc174b36afd1c7723bd h: refs/heads/master i: 126813: 13885a71479adc155eec5341cb876ac3acf5a60e 126811: e88239490a2db5d9f193801b594871d965881101 126807: 67ad99608e2b7082bd98e14e9d36cef4220eb6d4 126799: a527c6ae6ccaccce7f403641578195276418c8fa 126783: 82ce80aa9c1b773fe39db1b8d5a687f84e3a8eb7 v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a474e19eae87..dbf218014ec6 100644 --- 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 index c5019a5dcaa4..973f97362ceb 100644 --- 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; }