[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1450433155-31615-1-git-send-email-sudipm.mukherjee@gmail.com>
Date: Fri, 18 Dec 2015 15:35:55 +0530
From: Sudip Mukherjee <sudipm.mukherjee@...il.com>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: linux-kernel@...r.kernel.org,
Sudip Mukherjee <sudipm.mukherjee@...il.com>,
Chris Wilson <chris@...is-wilson.co.uk>,
Ingo Molnar <mingo@...nel.org>
Subject: [PATCH] Revert "kernel/stop_machine.c: remove CONFIG_SMP dependencies"
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@...is-wilson.co.uk>
Cc: Ingo Molnar <mingo@...nel.org>
Signed-off-by: Sudip Mukherjee <sudip@...torindia.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@...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