Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

x86: unify smp_intr_init() in irqinit_{32,64}.h 



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 d3496c85

arch/x86/kernel/irqinit_32.c

+5 −3
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ 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)

#ifdef CONFIG_SMP

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

	/*

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

	 * IPI, driven by wakeup.
@@ -143,7 +144,7 @@ static void __init smp_intr_init(void) 
	/* IPI for generic function call */

	alloc_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt);



	/* IPI for single call function */

	/* IPI for generic single function call */

	alloc_intr_gate(CALL_FUNCTION_SINGLE_VECTOR,

			call_function_single_interrupt);
@@ -151,6 +152,7 @@ static void __init smp_intr_init(void) 
	set_intr_gate(IRQ_MOVE_CLEANUP_VECTOR, irq_move_cleanup_interrupt);

	set_bit(IRQ_MOVE_CLEANUP_VECTOR, used_vectors);

#endif

#endif /* CONFIG_SMP */

}



/**

arch/x86/kernel/irqinit_64.c

+2 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); 
static void __init smp_intr_init(void)

{

#ifdef CONFIG_SMP

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

	/*

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

	 * IPI, driven by wakeup.
@@ -134,6 +135,7 @@ static void __init smp_intr_init(void) 
	set_intr_gate(IRQ_MOVE_CLEANUP_VECTOR, irq_move_cleanup_interrupt);

	set_bit(IRQ_MOVE_CLEANUP_VECTOR, used_vectors);

#endif

#endif /* CONFIG_SMP */

}



static void __init apic_intr_init(void)