[tip:x86/urgent] x86, smpboot: Fix cores per node printing on boot

From: tip-bot for Borislav Petkov
Date: Wed Jun 02 2010 - 03:45:24 EST


Commit-ID: 4adc8b71cc142f9a7b44b13b99aab38ba897c56f
Gitweb: http://git.kernel.org/tip/4adc8b71cc142f9a7b44b13b99aab38ba897c56f
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
AuthorDate: Tue, 1 Jun 2010 21:04:55 +0200
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Wed, 2 Jun 2010 09:38:53 +0200

x86, smpboot: Fix cores per node printing on boot

Percpu initialization happens now after booting the cores on the
machine and this causes them all to be displayed as belonging to
node 0:

Jun 8 05:57:21 kepek kernel: [ 0.106999] Booting Node 0,
Processors #1 #2 #3 #4 #5 #6 #7 #8 #9 #10 #11 #12 #13 #14 #15 #16 #17 #18 #19 #20 #21 #22 #23 Ok.

Use early_cpu_to_node() to get the correct node of each core
instead.

Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
Cc: Mike Travis <travis@xxxxxxx>
LKML-Reference: <20100601190455.GA14237@aftab>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/x86/kernel/smpboot.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 37462f1..c4f33b2 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -686,7 +686,7 @@ static void __cpuinit do_fork_idle(struct work_struct *work)
static void __cpuinit announce_cpu(int cpu, int apicid)
{
static int current_node = -1;
- int node = cpu_to_node(cpu);
+ int node = early_cpu_to_node(cpu);

if (system_state == SYSTEM_BOOTING) {
if (node != current_node) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/