local APIC init fixes for 2.4.21-pre5
PATCH 1/1 local APIC init fixes for 2.4.21-pre5
Marcelo & Alan,
This patch for 2.4.21-pre fixes two local APIC initialisation bugs. It has been reported to fix serious stability problems with UP kernels on SMP Athlons. It needs to go in 2.4.21-pre & -ac as soon as possible.
Bug 1: APIC_init_uniprocessor() has a broken write to APIC_ID, forcing APIC_ID to always be zero for the boot CPU. This causes serious problems when running UP kernels on SMP Athlons. The fix is to remove the write altogether, since it's redundant and potentially dangerous.
Bug 2: APIC_init_uniprocessor() incorrectly sets phys_cpu_present_map to 1 instead of 1 << boot_cpu_physical_apicid. Any machine whose boot CPU doesn't have ID zero will trigger a BUG() in setup_local_APIC(). The fix is to correct the initialisation of phys_cpu_present_map.
/Mikael
arch/i386/kernel/apic.c +1 -3
@@ -649,7 +649,6 @@ }set_bit (X86_FEATURE_APIC , &boot_cpu_data.x86_capability); mp_lapic_addr =APIC_DEFAULT_PHYS_BASE ; - boot_cpu_physical_apicid =0 ;if (nmi_watchdog !=NMI_NONE ) nmi_watchdog =NMI_LOCAL_APIC ;
@@ -1169,8 +1168,7 @@connect_bsp_APIC (); - phys_cpu_present_map =1 ; -apic_write_around (APIC_ID , boot_cpu_physical_apicid); + phys_cpu_present_map =1 << boot_cpu_physical_apicid;apic_pm_init2 ();