From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756020AbZHMUDv (ORCPT ); Thu, 13 Aug 2009 16:03:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756113AbZHMUD1 (ORCPT ); Thu, 13 Aug 2009 16:03:27 -0400 Received: from kroah.org ([198.145.64.141]:41917 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932280AbZHMUAC (ORCPT ); Thu, 13 Aug 2009 16:00:02 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Thu Aug 13 12:51:33 2009 Message-Id: <20090813195133.179908882@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Thu, 13 Aug 2009 12:50:33 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Xiao Guangrong , Ingo Molnar , Jens Axboe , Nick Piggin , Peter Zijlstra , Rusty Russell Subject: [patch 58/74] generic-ipi: fix hotplug_cfd() References: <20090813194935.985368088@mini.kroah.org> Content-Disposition: inline; filename=generic-ipi-fix-hotplug_cfd.patch In-Reply-To: <20090813195705.GA22393@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.30-stable review patch. If anyone has any objections, please let us know. ------------------ From: Xiao Guangrong commit 69dd647f969c28d18de77e2153f30d05a1874571 upstream. Use CONFIG_HOTPLUG_CPU, not CONFIG_CPU_HOTPLUG When hot-unpluging a cpu, it will leak memory allocated at cpu hotplug, but only if CPUMASK_OFFSTACK=y, which is default to n. The bug was introduced by 8969a5ede0f9e17da4b943712429aef2c9bcd82b ("generic-ipi: remove kmalloc()"). Signed-off-by: Xiao Guangrong Cc: Ingo Molnar Cc: Jens Axboe Cc: Nick Piggin Cc: Peter Zijlstra Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- kernel/smp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/smp.c +++ b/kernel/smp.c @@ -57,7 +57,7 @@ hotplug_cfd(struct notifier_block *nfb, return NOTIFY_BAD; break; -#ifdef CONFIG_CPU_HOTPLUG +#ifdef CONFIG_HOTPLUG_CPU case CPU_UP_CANCELED: case CPU_UP_CANCELED_FROZEN: