Revert "x86: fix show cpuinfo cpu number always zero"
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 26 Dec 2007 04:16:16 +0000 (20:16 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 26 Dec 2007 04:16:16 +0000 (20:16 -0800)
This reverts commit fbdcf18df73758b2e187ab94678b30cd5f6ff9f9.

As pointed out by Yanmin Zhang, the problem was already fixed
differently (and correctly), and rather than fix anything, it actually
causes us to create a sub-optimal sched-domains hierarchy (not setting
up the domain belonging to the core) when CONFIG_X86_HT=y.

Requested-by: Yanmin Zhang <yanmin_zhang@linux.intel.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86/kernel/smpboot_64.c

index 594889521da1bad7835dc0f2ec372aebe3d33206..500670c93d81d278e0402289803f5881946226b5 100644 (file)
@@ -141,8 +141,8 @@ static void __cpuinit smp_store_cpu_info(int id)
        struct cpuinfo_x86 *c = &cpu_data(id);
 
        *c = boot_cpu_data;
-       identify_cpu(c);
        c->cpu_index = id;
+       identify_cpu(c);
        print_cpu_info(c);
 }