From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964926AbbLROYQ (ORCPT ); Fri, 18 Dec 2015 09:24:16 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:60123 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932821AbbLROYN (ORCPT ); Fri, 18 Dec 2015 09:24:13 -0500 From: Arnd Bergmann To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] kernel/stop_machine: remove HOTPLUG_CPU dependency Date: Fri, 18 Dec 2015 15:23:40 +0100 Message-ID: <3973773.5dBOxplscZ@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:988bj0XID8MxdhC9YGHd45E+9DW/2lRLOMxm+QJd7eFCL78vqwa NYEGxiqxYfrdKuRA70uHxPNDxDW+muzcZZZq4wzw+nXqhZyEbh63n9gApMFPVuGE2/vASH4 DDydSqWrlI8nnE1elKghPFS3ztQdQXEfv5sov3pWfLKvr9O4c7gxDhEwPZR6sst9XlI7IT1 vmQ8R7jLQeQro0IwNCUqg== X-UI-Out-Filterresults: notjunk:1;V01:K0:VtWWqxRA7iI=:gH+2iW2b+sDnvxj7arpAEy +QKyBSDOoqZG/r4qb3hpiY+Agu99izpy2NHUs857vHVMXi4nnrUnP98dOw3yxgXgRpdixjLdq uy/kzCDwvd3QqzFuftyO2DKM0TQgSMoYD/GHnESI2NbdW4M6FEQcpRZUOVJRbznj99JoBQzD9 qh+oYOPzWGuDjY4vj8CKX6a4z+98fHOkHKjDnpP1+URC6KDDZ1ICDO8yFyY8qxsXlSpIgTJtt IdEhyYNZHDKCqwDhMxFrXGo7fNTEWKC0neeUTSbih7iGE7+0NUb9BDXY5tR6p9yq7nYaMtDDS GI14M/6FYZS148l37/6Js+Ug+sPqKoo0nn3qotBTf1ULaflqL0jhVcxeBDIIi6M3XDGFlQ6PV JullVTx4g9EFzerL1ffoWO+Ryc9oCpzCCztp4Q0Wc2UlQCTLBholEM52BzXEvDgpYWDLHpFQQ PFSl190D1XN1lY2g6fv+pDmZb2ZsjK3bMqwfxaQuFRdLDxHneTQpjgXCR0lBMktJtkrVXonug K1M/K4lDA3SXW6fVw2HJn/GUjWLpVhLOijwowzAPq75F17PFB+DgfFSvxbbC9f7uPwGOBTYm1 kczf1IizzcGyZuq9NUnLhYwXEsUPKNDXTk3k9i/rEPp7fR2I/Db4vYFC8dYE5u02ddklcClkp QGWc7Mrf8zp/vBegpYwv2oLXMA8hMbKnIOssR5pyq6F2U76y0WeqbUmpwpKfN2ew/RpHmj/jj Y+6xSAQDX+zuGd7F Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A number of things rely on stop_machine, not just HOTPLUG_CPU, as got apparent, when we stopped building the functions for all SMP configurations: arch/arm/kernel/built-in.o: In function `patch_text': arch/arm/kernel/patch.c:127: undefined reference to `stop_machine' arch/arm/probes/built-in.o: In function `kprobes_remove_breakpoint': arch/arm/probes/kprobes/core.c:184: undefined reference to `stop_machine' arch/arm/probes/kprobes/core.c:184: undefined reference to `stop_machine' kernel/built-in.o: In function `timekeeping_notify': kernel/time/timekeeping.c:1096: undefined reference to `stop_machine' mm/built-in.o: In function `build_all_zonelists': This restores the original behavior by always compiling the stop_machine function. Signed-off-by: Arnd Bergmann Fixes: 64dab25b058c ("kernel/stop_machine.c: remove CONFIG_SMP dependencies") --- Found on ARM randconfig builds with today's linux-next, please apply or fold into the original patch. diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index b07adef99a82..a467e6c28a3b 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -529,8 +529,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 = { @@ -628,5 +626,3 @@ int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data, mutex_unlock(&stop_cpus_mutex); return ret ?: done.ret; } - -#endif /* CONFIG_HOTPLUG_CPU */