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

x86: introduce smp_intr_init() in irqinit_32.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 7371d9fc

arch/x86/kernel/irqinit_32.c

+33 −28
Original line number Diff line number Diff line
@@ -121,6 +121,38 @@ static void __init init_ISA_irqs(void) 
/* Overridden in paravirt.c */

void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ")));



static void __init smp_intr_init(void)

{

#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_SMP)

	/*

	 * The reschedule interrupt is a CPU-to-CPU reschedule-helper

	 * IPI, driven by wakeup.

	 */

	alloc_intr_gate(RESCHEDULE_VECTOR, reschedule_interrupt);



	/* IPIs for invalidation */

	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+0, invalidate_interrupt0);

	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+1, invalidate_interrupt1);

	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+2, invalidate_interrupt2);

	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+3, invalidate_interrupt3);

	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+4, invalidate_interrupt4);

	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+5, invalidate_interrupt5);

	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+6, invalidate_interrupt6);

	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+7, invalidate_interrupt7);



	/* IPI for generic function call */

	alloc_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt);



	/* IPI for single call function */

	alloc_intr_gate(CALL_FUNCTION_SINGLE_VECTOR,

				 call_function_single_interrupt);



	/* Low priority IPI to cleanup after moving an irq */

	set_intr_gate(IRQ_MOVE_CLEANUP_VECTOR, irq_move_cleanup_interrupt);

	set_bit(IRQ_MOVE_CLEANUP_VECTOR, used_vectors);

#endif

}



/**

 * x86_quirk_pre_intr_init - initialisation prior to setting up interrupt vectors

 *
@@ -158,34 +190,7 @@ void __init native_init_IRQ(void) 
	}





#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_SMP)

	/*

	 * The reschedule interrupt is a CPU-to-CPU reschedule-helper

	 * IPI, driven by wakeup.

	 */

	alloc_intr_gate(RESCHEDULE_VECTOR, reschedule_interrupt);



	/* IPIs for invalidation */

	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+0, invalidate_interrupt0);

	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+1, invalidate_interrupt1);

	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+2, invalidate_interrupt2);

	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+3, invalidate_interrupt3);

	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+4, invalidate_interrupt4);

	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+5, invalidate_interrupt5);

	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+6, invalidate_interrupt6);

	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+7, invalidate_interrupt7);



	/* IPI for generic function call */

	alloc_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt);



	/* IPI for single call function */

	alloc_intr_gate(CALL_FUNCTION_SINGLE_VECTOR,

				 call_function_single_interrupt);



	/* Low priority IPI to cleanup after moving an irq */

	set_intr_gate(IRQ_MOVE_CLEANUP_VECTOR, irq_move_cleanup_interrupt);

	set_bit(IRQ_MOVE_CLEANUP_VECTOR, used_vectors);

#endif

	smp_intr_init();



#ifdef CONFIG_X86_LOCAL_APIC

	/* self generated IPI for local APIC timer */