Commit b5841765 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: provide connect_bsp_APIC for x86_64 



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: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3fde6900

arch/x86/kernel/apic_64.c

+10 −0
Original line number Diff line number Diff line
@@ -918,6 +918,8 @@ int __init APIC_init_uniprocessor(void) 


	verify_local_APIC();



	connect_bsp_APIC();



	physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map);

	apic_write(APIC_ID, SET_APIC_ID(boot_cpu_physical_apicid));
@@ -999,6 +1001,14 @@ asmlinkage void smp_error_interrupt(void) 
	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)

{

	/* Go back to Virtual Wire compatibility mode */

arch/x86/kernel/smpboot.c

+1 −4
Original line number Diff line number Diff line
@@ -1116,9 +1116,7 @@ static int __init smp_sanity_check(unsigned max_cpus) 


		localise_nmi_watchdog();



#ifdef CONFIG_X86_32

		connect_bsp_APIC();

#endif

		setup_local_APIC();

		end_local_APIC_setup();

		return -1;
@@ -1173,9 +1171,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) 
	}

	preempt_enable();



#ifdef CONFIG_X86_32

	connect_bsp_APIC();

#endif



	/*

	 * Switch from PIC to APIC mode.

	 */