Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752689AbbLVG77 (ORCPT ); Tue, 22 Dec 2015 01:59:59 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:52470 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752389AbbLVG75 (ORCPT ); Tue, 22 Dec 2015 01:59:57 -0500 Date: Mon, 21 Dec 2015 22:59:45 -0800 From: Andrew Morton To: Sudip Mukherjee Cc: linux-kernel@vger.kernel.org, Chris Wilson , Ingo Molnar , Stephen Rothwell Subject: Re: [PATCH] Revert "kernel/stop_machine.c: remove CONFIG_SMP dependencies" Message-Id: <20151221225945.ab20d8fe.akpm@linux-foundation.org> In-Reply-To: <20151222060051.GA5684@sudip-pc> References: <1450433155-31615-1-git-send-email-sudipm.mukherjee@gmail.com> <20151218150753.6fa343f146682f17800c3b0a@linux-foundation.org> <20151222060051.GA5684@sudip-pc> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1859 Lines: 58 On Tue, 22 Dec 2015 11:30:51 +0530 Sudip Mukherjee wrote: > > Rationale: > > > > stop_machine.o is only built when CONFIG_SMP=y so > > > > #if defined(CONFIG_SMP) || defined(CONFIG_HOTPLUG_CPU) > > > > always evaluates to true, so remove it. > > Hi Andrew, > The error is still there. I guess you have been busy. :) > > next-20151222 fails with the same error. You can see the m32r defconfig > at https://travis-ci.org/sudipm-mukherjee/parport/jobs/98258267 I forgot to Cc Stephen :( From: Andrew Morton Subject: kernel-stop_machinec-remove-config_smp-dependencies-fix stop_machine.o is only built if CONFIG_SMP=y, so this ifdef always evaluates to true. Cc: Chris Wilson Cc: Ingo Molnar Cc: Valentin Rothberg Signed-off-by: Andrew Morton --- kernel/stop_machine.c | 4 ---- 1 file changed, 4 deletions(-) diff -puN kernel/stop_machine.c~kernel-stop_machinec-remove-config_smp-dependencies-fix kernel/stop_machine.c --- a/kernel/stop_machine.c~kernel-stop_machinec-remove-config_smp-dependencies-fix +++ a/kernel/stop_machine.c @@ -531,8 +531,6 @@ static int __init cpu_stop_init(void) } early_initcall(cpu_stop_init); -#ifdef CONFIG_HOTPLUG_CPU - static int __stop_machine(cpu_stop_fn_t fn, void *data, const struct cpumask *cpus) { struct multi_stop_data msdata = { @@ -630,5 +628,3 @@ int stop_machine_from_inactive_cpu(cpu_s mutex_unlock(&stop_cpus_mutex); return ret ?: done.ret; } - -#endif /* CONFIG_HOTPLUG_CPU */ _ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/