From 911318d797d7b1c494651be25e8197c9899ccdc8 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 25 Dec 2007 20:16:16 -0800 Subject: [PATCH] Revert "x86: fix show cpuinfo cpu number always zero" This reverts commit 9a0493141529663c08bd0c7d59677c9725234156. 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 Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds --- arch/x86/kernel/smpboot_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c index 594889521da1b..500670c93d81d 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); } -- 2.39.5