Commit fa6b95fc authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: apic - unify end_local_APIC_setup 



Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1b313f4a

arch/x86/kernel/apic_32.c

+4 −2
Original line number Diff line number Diff line
@@ -1155,13 +1155,15 @@ void __cpuinit setup_local_APIC(void) 


void __cpuinit end_local_APIC_setup(void)

{

	unsigned long value;



	lapic_setup_esr();



#ifdef CONFIG_X86_32

	unsigned int value;

	/* Disable the local apic timer */

	value = apic_read(APIC_LVTT);

	value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);

	apic_write(APIC_LVTT, value);

#endif



	setup_apic_nmi_watchdog(NULL);

	apic_pm_activate();

arch/x86/kernel/apic_64.c

+9 −0
Original line number Diff line number Diff line
@@ -1014,6 +1014,15 @@ void __cpuinit setup_local_APIC(void) 
void __cpuinit end_local_APIC_setup(void)

{

	lapic_setup_esr();



#ifdef CONFIG_X86_32

	unsigned int value;

	/* Disable the local apic timer */

	value = apic_read(APIC_LVTT);

	value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);

	apic_write(APIC_LVTT, value);

#endif



	setup_apic_nmi_watchdog(NULL);

	apic_pm_activate();

}