Skip to content

Commit

Permalink
x86/voyager: fix missing cpu_index initialisation
Browse files Browse the repository at this point in the history
Impact: fix /proc/cpuinfo output on x86/Voyager

Ever since

| commit 92cb761
| Author: Mike Travis <travis@sgi.com>
| Date:   Fri Oct 19 20:35:04 2007 +0200
|
|     x86: convert cpuinfo_x86 array to a per_cpu array

We've had an extra field in cpuinfo_x86 which is cpu_index.
Unfortunately, voyager has never initialised this, although the only
noticeable impact seems to be that /proc/cpuinfo shows all zeros for
the processor ids.

Anyway, fix this by initialising the boot CPU properly and setting the
index when the secondaries update.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
James Bottomley authored and Ingo Molnar committed Oct 30, 2008
1 parent b3572e3 commit bfcb4c1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/x86/kernel/cpu/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,8 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
this_cpu->c_early_init(c);

validate_pat_support(c);

c->cpu_index = boot_cpu_id;
}

void __init early_cpu_init(void)
Expand Down
1 change: 1 addition & 0 deletions arch/x86/mach-voyager/voyager_smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ void __init smp_store_cpu_info(int id)
struct cpuinfo_x86 *c = &cpu_data(id);

*c = boot_cpu_data;
c->cpu_index = id;

identify_secondary_cpu(c);
}
Expand Down

0 comments on commit bfcb4c1

Please sign in to comment.