* [PATCH] x86: remove nesting CONFIG_HOTPLUG_CPU
@ 2008-08-04 3:26 Li Zefan
2008-08-15 14:33 ` Ingo Molnar
0 siblings, 1 reply; 2+ messages in thread
From: Li Zefan @ 2008-08-04 3:26 UTC (permalink / raw)
To: Ingo Molnar; +Cc: H. Peter Anvin, Thomas Gleixner, LKML
prefill_possible_map() is defined inside CONFIG_HOTPLUG_CPU,
so the nesting CONFIG_HOTPLUG_CPU is just redundant.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
arch/x86/kernel/smpboot.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 3325127..d5e19c3 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1271,16 +1271,13 @@ __init void prefill_possible_map(void)
if (!num_processors)
num_processors = 1;
-#ifdef CONFIG_HOTPLUG_CPU
if (additional_cpus == -1) {
if (disabled_cpus > 0)
additional_cpus = disabled_cpus;
else
additional_cpus = 0;
}
-#else
- additional_cpus = 0;
-#endif
+
possible = num_processors + additional_cpus;
if (possible > NR_CPUS)
possible = NR_CPUS;
--
1.5.4.rc3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] x86: remove nesting CONFIG_HOTPLUG_CPU
2008-08-04 3:26 [PATCH] x86: remove nesting CONFIG_HOTPLUG_CPU Li Zefan
@ 2008-08-15 14:33 ` Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2008-08-15 14:33 UTC (permalink / raw)
To: Li Zefan; +Cc: H. Peter Anvin, Thomas Gleixner, LKML
* Li Zefan <lizf@cn.fujitsu.com> wrote:
> prefill_possible_map() is defined inside CONFIG_HOTPLUG_CPU, so the
> nesting CONFIG_HOTPLUG_CPU is just redundant.
applied to tip/x86/cleanups - thanks.
Ingo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-08-15 14:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-04 3:26 [PATCH] x86: remove nesting CONFIG_HOTPLUG_CPU Li Zefan
2008-08-15 14:33 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox