Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1294626

[PATCH] Revert "kernel/stop_machine.c: remove CONFIG_SMP dependencies"

Show all headers | View raw

This reverts commit 64dab25b058c12f935794cb239089303bda7dbc1.

CONFIG_SMP dependency is needed for some arch like tile, tilegx and
m32r. They use stop_machine() but they donot have HOTPLUG_CPU and as a
result their builds are failing with "undefined symbol 'stop_machine'".

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---

tile build at:
https://travis-ci.org/sudipm-mukherjee/parport/jobs/97618549

tilegx build at:
https://travis-ci.org/sudipm-mukherjee/parport/jobs/97618550

m32r build at:
https://travis-ci.org/sudipm-mukherjee/parport/jobs/97618542

 kernel/stop_machine.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index b07adef..edb6de4 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -529,7 +529,7 @@ static int __init cpu_stop_init(void)
 }
 early_initcall(cpu_stop_init);
 
-#ifdef CONFIG_HOTPLUG_CPU
+#if defined(CONFIG_SMP) || defined(CONFIG_HOTPLUG_CPU)
 
 static int __stop_machine(cpu_stop_fn_t fn, void *data, const struct cpumask *cpus)
 {
@@ -629,4 +629,4 @@ int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data,
 	return ret ?: done.ret;
 }
 
-#endif	/* CONFIG_HOTPLUG_CPU */
+#endif	/* CONFIG_SMP || CONFIG_HOTPLUG_CPU */
-- 
1.9.1

--
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/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] Revert "kernel/stop_machine.c: remove CONFIG_SMP dependencies" Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-12-18 11:10 +0100
  Re: [PATCH] Revert "kernel/stop_machine.c: remove CONFIG_SMP  dependencies" Chris Metcalf <cmetcalf@ezchip.com> - 2015-12-18 16:00 +0100
  Re: [PATCH] Revert  "kernel/stop_machine.c: remove CONFIG_SMP dependencies" Andrew Morton <akpm@linux-foundation.org> - 2015-12-19 00:10 +0100
    Re: [PATCH] Revert "kernel/stop_machine.c: remove CONFIG_SMP  dependencies" Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-12-22 07:10 +0100
      Re: [PATCH] Revert  "kernel/stop_machine.c: remove CONFIG_SMP dependencies" Andrew Morton <akpm@linux-foundation.org> - 2015-12-22 08:10 +0100
        Re: [PATCH] Revert "kernel/stop_machine.c: remove CONFIG_SMP  dependencies" Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-22 21:10 +0100

csiph-web