Ingo.

commit fbdcf18df73758b2e187ab94678b30cd5f6ff9f9  is not needed. 
another patch  (by you !! commit 699d934d5f958d7944d195c03c334f28cc0b3669  x86: 
fixup cpu_info array conversion)
already removed clearing of c->cpu_index. in identify_cpu

also it is not consisent to smpboot_32.c. (it will assign id to cpu_index right 
after 
        *c = boot_cpu_data;
)

by revert commit fbdcf18df73758b2e187ab94678b30cd5f6ff9f9, we could use 
c->cpu_index in identify_cpu.

YH

commit fbdcf18df73758b2e187ab94678b30cd5f6ff9f9
Author: Mike Travis <[EMAIL PROTECTED]>
Date:   Wed Dec 19 23:20:19 2007 +0100

    x86: fix show cpuinfo cpu number always zero
    
    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 <[EMAIL PROTECTED]>
    Cc: Andi Kleen <[EMAIL PROTECTED]>
    Cc: Christoph Lameter <[EMAIL PROTECTED]>
    Cc: Jack Steiner <[EMAIL PROTECTED]>
    Cc: Suresh B Siddha <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>

diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index 500670c..5948895 100644
--- 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(int id)
        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);
 }
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to