Commit ab19c25a authored by Pekka Enberg's avatar Pekka Enberg Committed by Ingo Molnar
Browse files

x86: unify apic_intr_init() in irqinit_{32,64}.c 



Impact: cleanup

Reviewed-by Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 77883860

arch/x86/kernel/irqinit_32.c

+8 −1
Original line number Diff line number Diff line
@@ -180,7 +180,12 @@ static void __init apic_intr_init(void) 
{

	smp_intr_init();



#ifdef CONFIG_X86_LOCAL_APIC

#ifdef CONFIG_X86_64

	alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);

	alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt);

#endif



#if defined(CONFIG_X86_64) || defined(CONFIG_X86_LOCAL_APIC)

	/* self generated IPI for local APIC timer */

	alloc_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt);
@@ -192,10 +197,12 @@ static void __init apic_intr_init(void) 
	alloc_intr_gate(ERROR_APIC_VECTOR, error_interrupt);

#endif



#ifdef CONFIG_X86_32

#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_MCE_P4THERMAL)

	/* thermal monitor LVT interrupt */

	alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);

#endif

#endif

}



#ifdef CONFIG_X86_32

arch/x86/kernel/irqinit_64.c

+11 −0
Original line number Diff line number Diff line
@@ -180,9 +180,12 @@ static void __init apic_intr_init(void) 
{

	smp_intr_init();



#ifdef CONFIG_X86_64

	alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);

	alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt);

#endif



#if defined(CONFIG_X86_64) || defined(CONFIG_X86_LOCAL_APIC)

	/* self generated IPI for local APIC timer */

	alloc_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt);
@@ -192,6 +195,14 @@ static void __init apic_intr_init(void) 
	/* IPI vectors for APIC spurious and error interrupts */

	alloc_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt);

	alloc_intr_gate(ERROR_APIC_VECTOR, error_interrupt);

#endif



#ifdef CONFIG_X86_32

#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_MCE_P4THERMAL)

	/* thermal monitor LVT interrupt */

	alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);

#endif

#endif

}



#ifdef CONFIG_X86_32