From ae23dc5bb62debf0a2add615542919aac86e2601 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 19 Oct 2007 20:35:02 +0200 Subject: [PATCH] --- yaml --- r: 71675 b: refs/heads/master c: 54ffaa45c5f572ff6c344ca583137d0edf2d78cc h: refs/heads/master i: 71673: cce16f950491c5d734499efdfdf12b5df1c1f57d 71671: ea49a0dc4ecbea7a7edc082ef4d0e46bbe3a41e4 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/smpboot_32.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a36c39b6fc8e..7d286a2fda7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ceba7815cfc0b5d4c2bef5bb58e0c766da63549 +refs/heads/master: 54ffaa45c5f572ff6c344ca583137d0edf2d78cc diff --git a/trunk/arch/x86/kernel/smpboot_32.c b/trunk/arch/x86/kernel/smpboot_32.c index be3faac04719..65e5de7d64db 100644 --- a/trunk/arch/x86/kernel/smpboot_32.c +++ b/trunk/arch/x86/kernel/smpboot_32.c @@ -1008,6 +1008,7 @@ static void __init smp_boot_cpus(unsigned int max_cpus) printk(KERN_ERR "... forcing use of dummy APIC emulation. (tell your hw vendor)\n"); smpboot_clear_io_apic_irqs(); phys_cpu_present_map = physid_mask_of_physid(0); + map_cpu_to_logical_apicid(); cpu_set(0, per_cpu(cpu_sibling_map, 0)); cpu_set(0, per_cpu(cpu_core_map, 0)); return; @@ -1029,6 +1030,7 @@ static void __init smp_boot_cpus(unsigned int max_cpus) } smpboot_clear_io_apic_irqs(); phys_cpu_present_map = physid_mask_of_physid(0); + map_cpu_to_logical_apicid(); cpu_set(0, per_cpu(cpu_sibling_map, 0)); cpu_set(0, per_cpu(cpu_core_map, 0)); return;