[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20151221225945.ab20d8fe.akpm@linux-foundation.org>
Date: Mon, 21 Dec 2015 22:59:45 -0800
From: Andrew Morton <akpm@...ux-foundation.org>
To: Sudip Mukherjee <sudipm.mukherjee@...il.com>
Cc: linux-kernel@...r.kernel.org,
Chris Wilson <chris@...is-wilson.co.uk>,
Ingo Molnar <mingo@...nel.org>,
Stephen Rothwell <sfr@...b.auug.org.au>
Subject: Re: [PATCH] Revert
"kernel/stop_machine.c: remove CONFIG_SMP dependencies"
On Tue, 22 Dec 2015 11:30:51 +0530 Sudip Mukherjee <sudipm.mukherjee@...il.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@...ux-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@...is-wilson.co.uk>
Cc: Ingo Molnar <mingo@...nel.org>
Cc: Valentin Rothberg <valentinrothberg@...il.com>
Signed-off-by: Andrew Morton <akpm@...ux-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@...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