[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1386173591-28514-2-git-send-email-liuj97@gmail.com>
Date: Thu, 5 Dec 2013 00:12:52 +0800
From: Jiang Liu <liuj97@...il.com>
To: Andrew Morton <akpm@...ux-foundation.org>,
Shaohua Li <shli@...nel.org>, Ingo Molnar <mingo@...nel.org>,
Christoph Hellwig <hch@....de>,
Wang YanQing <udknight@...il.com>,
Xie XiuQi <xiexiuqi@...wei.com>, linux-kernel@...r.kernel.org
Cc: Jiang Liu <liuj97@...il.com>, Ingo Molnar <mingo@...e.hu>,
Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Steven Rostedt <rostedt@...dmis.org>,
Jiri Kosina <trivial@...nel.org>, linux-arch@...r.kernel.org
Subject: [RFC PATCH v3 01/19] Revert "kernel/smp.c: free related resources when failure occurs in hotplug_cfd()"
This reverts commit 60c323699bb308404dcb60e8808531e02651578a.
Commit 60c323699bb30840 fixes a bug introduced by f44310b98ddb7, and we
are going to revert f44310b98ddb7, so revert 60c323699bb30840 first.
Signed-off-by: Jiang Liu <liuj97@...il.com>
---
kernel/smp.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/kernel/smp.c b/kernel/smp.c
index bd9f940..442d514 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -48,13 +48,10 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)
cpu_to_node(cpu)))
return notifier_from_errno(-ENOMEM);
if (!zalloc_cpumask_var_node(&cfd->cpumask_ipi, GFP_KERNEL,
- cpu_to_node(cpu))) {
- free_cpumask_var(cfd->cpumask);
+ cpu_to_node(cpu)))
return notifier_from_errno(-ENOMEM);
- }
cfd->csd = alloc_percpu(struct call_single_data);
if (!cfd->csd) {
- free_cpumask_var(cfd->cpumask_ipi);
free_cpumask_var(cfd->cpumask);
return notifier_from_errno(-ENOMEM);
}
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists