Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1294626 > unrolled thread
| Started by | Sudip Mukherjee <sudipm.mukherjee@gmail.com> |
|---|---|
| First post | 2015-12-18 11:10 +0100 |
| Last post | 2015-12-22 21:10 +0100 |
| Articles | 6 — 4 participants |
Back to article view | Back to linux.kernel
[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
| From | Sudip Mukherjee <sudipm.mukherjee@gmail.com> |
|---|---|
| Date | 2015-12-18 11:10 +0100 |
| Subject | [PATCH] Revert "kernel/stop_machine.c: remove CONFIG_SMP dependencies" |
| Message-ID | <qH093-4ey-7@gated-at.bofh.it> |
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/
[toc] | [next] | [standalone]
| From | Chris Metcalf <cmetcalf@ezchip.com> |
|---|---|
| Date | 2015-12-18 16:00 +0100 |
| Subject | Re: [PATCH] Revert "kernel/stop_machine.c: remove CONFIG_SMP dependencies" |
| Message-ID | <qH4FI-6Xw-17@gated-at.bofh.it> |
| In reply to | #1294626 |
On 12/18/2015 05:05 AM, Sudip Mukherjee wrote: > 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(-) Acked-by: Chris Metcalf <cmetcalf@ezchip.com> [for tile] -- Chris Metcalf, EZChip Semiconductor http://www.ezchip.com -- 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/
[toc] | [prev] | [next] | [standalone]
| From | Andrew Morton <akpm@linux-foundation.org> |
|---|---|
| Date | 2015-12-19 00:10 +0100 |
| Subject | Re: [PATCH] Revert "kernel/stop_machine.c: remove CONFIG_SMP dependencies" |
| Message-ID | <qHcjU-3Fb-11@gated-at.bofh.it> |
| In reply to | #1294626 |
On Fri, 18 Dec 2015 15:35:55 +0530 Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote:
> 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'".
Thanks. I had my &&'s and ||'s mixed up. I did this:
--- 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 */
_
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.
--
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/
[toc] | [prev] | [next] | [standalone]
| From | Sudip Mukherjee <sudipm.mukherjee@gmail.com> |
|---|---|
| Date | 2015-12-22 07:10 +0100 |
| Subject | Re: [PATCH] Revert "kernel/stop_machine.c: remove CONFIG_SMP dependencies" |
| Message-ID | <qIoiZ-aT-1@gated-at.bofh.it> |
| In reply to | #1295236 |
On Fri, Dec 18, 2015 at 03:07:53PM -0800, Andrew Morton wrote:
> On Fri, 18 Dec 2015 15:35:55 +0530 Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote:
>
> > 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'".
>
> Thanks. I had my &&'s and ||'s mixed up. I did this:
>
> --- 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 */
> _
>
>
> 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
do you want me to send the patch to you for it?
regards
sudip
--
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/
[toc] | [prev] | [next] | [standalone]
| From | Andrew Morton <akpm@linux-foundation.org> |
|---|---|
| Date | 2015-12-22 08:10 +0100 |
| Subject | Re: [PATCH] Revert "kernel/stop_machine.c: remove CONFIG_SMP dependencies" |
| Message-ID | <qIpf4-Md-19@gated-at.bofh.it> |
| In reply to | #1296561 |
On Tue, 22 Dec 2015 11:30:51 +0530 Sudip Mukherjee <sudipm.mukherjee@gmail.com> 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 <akpm@linux-foundation.org>
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 <chris@chris-wilson.co.uk>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Valentin Rothberg <valentinrothberg@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
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/
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-12-22 21:10 +0100 |
| Subject | Re: [PATCH] Revert "kernel/stop_machine.c: remove CONFIG_SMP dependencies" |
| Message-ID | <qIBpV-8vR-29@gated-at.bofh.it> |
| In reply to | #1296584 |
Hi Andrew, On Mon, 21 Dec 2015 22:59:45 -0800 Andrew Morton <akpm@linux-foundation.org> wrote: > > On Tue, 22 Dec 2015 11:30:51 +0530 Sudip Mukherjee <sudipm.mukherjee@gmail.com> 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 :( I wish I had figured this out earlier - last nights build were a blood bath :-( Anyway, I applied it for today. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au -- 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/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web