lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: provide connect_bsp_APIC for x86_64

Browse Source 
Although it is not really needed, we provide it to get
closer to i386. ifdefs around it are removed in smpboot.c

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Glauber Costa
2008-05-28 13:38:28 -03:00
committed by Ingo Molnar
parent 3fde690011
commit b5841765a2
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/kernel/apic_64.c
View File

@@ -918,6 +918,8 @@ int __init APIC_init_uniprocessor(void)
verify_local_APIC(); verify_local_APIC();
connect_bsp_APIC();
physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map); physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map);
apic_write(APIC_ID, SET_APIC_ID(boot_cpu_physical_apicid)); apic_write(APIC_ID, SET_APIC_ID(boot_cpu_physical_apicid));
@@ -999,6 +1001,14 @@ asmlinkage void smp_error_interrupt(void)
irq_exit(); irq_exit();
} }
/**
* * connect_bsp_APIC - attach the APIC to the interrupt system
* */
void __init connect_bsp_APIC(void)
{
enable_apic_mode();
}
void disconnect_bsp_APIC(int virt_wire_setup) void disconnect_bsp_APIC(int virt_wire_setup)
{ {
/* Go back to Virtual Wire compatibility mode */ /* Go back to Virtual Wire compatibility mode */

5
arch/x86/kernel/smpboot.c
View File

@@ -1116,9 +1116,7 @@ static int __init smp_sanity_check(unsigned max_cpus)
localise_nmi_watchdog(); localise_nmi_watchdog();
#ifdef CONFIG_X86_32
connect_bsp_APIC(); connect_bsp_APIC();
#endif
setup_local_APIC(); setup_local_APIC();
end_local_APIC_setup(); end_local_APIC_setup();
return -1; return -1;
@@ -1173,9 +1171,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
} }
preempt_enable(); preempt_enable();
#ifdef CONFIG_X86_32
connect_bsp_APIC(); connect_bsp_APIC();
#endif
/* /*
* Switch from PIC to APIC mode. * Switch from PIC to APIC mode.
*/ */