diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-25 20:16:16 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-25 20:16:16 -0800 |
commit | 00684418707c7a1e36ebdedc4b30fbba5d5860b1 (patch) | |
tree | 18b8be9345fbfbc12482bfa91ecad96f5e0fab39 /arch | |
parent | 5356f664e1d2149b67d2aeed644cc1def128a4ac (diff) | |
download | blackbird-op-linux-00684418707c7a1e36ebdedc4b30fbba5d5860b1.tar.gz blackbird-op-linux-00684418707c7a1e36ebdedc4b30fbba5d5860b1.zip |
Revert "x86: fix show cpuinfo cpu number always zero"
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/smpboot_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c index 594889521da1..500670c93d81 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; - identify_cpu(c); c->cpu_index = id; + identify_cpu(c); print_cpu_info(c); } |