[PATCH 0/1] x86: fix show cpuinfo cpu number always zero

[PATCH 0/1] x86: fix show cpuinfo cpu number always zero

[travis]

It appears that this patch is missing from the latest 2.6.24 git
kernel as well as the 2.6.24-rc5-mm1 patch?

> Mike, This issue still seems to be present in linus git tree. Perhaps
> the fix in -mm not pushed to mainline yet.
> 
> Can you please raise the flag with Andrew, so that he can push it before
> 2.6.24 gets out
> 

-- 

[PATCH 1/1] x86: fix show cpuinfo cpu number always zero

[travis]

[-- Attachment #1: cpuinfo_x86-fix --]
[-- Type: text/plain, Size: 660 bytes --]

This fix corrects the problem that early_identify_cpu() sets
cpu_index to '0' (needed when called by setup_arch) after
smp_store_cpu_info() had set it to the correct value.

The error shows up in 'cat /proc/cpuinfo' will all cpus = 0.

Signed-off-by: Mike Travis <travis@sgi.com>
---
 arch/x86/kernel/smpboot_64.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -141,8 +141,8 @@ static void __cpuinit smp_store_cpu_info
 	struct cpuinfo_x86 *c = &cpu_data(id);
 
 	*c = boot_cpu_data;
-	c->cpu_index = id;
 	identify_cpu(c);
+	c->cpu_index = id;
 	print_cpu_info(c);
 }
 

--