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

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

x86: unify init_ISA_irqs() 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 b0096bb0

arch/x86/kernel/irqinit_32.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static void __init init_ISA_irqs(void) 
{

	int i;



#ifdef CONFIG_X86_LOCAL_APIC

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

	init_bsp_APIC();

#endif

	init_8259A(0);

arch/x86/kernel/irqinit_64.c

+6 −4
Original line number Diff line number Diff line
@@ -84,9 +84,14 @@ static void __init init_ISA_irqs(void) 
{

	int i;



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

	init_bsp_APIC();

#endif

	init_8259A(0);



	/*

	 * 16 old-style INTA-cycle interrupts:

	 */

	for (i = 0; i < NR_IRQS_LEGACY; i++) {

		struct irq_desc *desc = irq_to_desc(i);
@@ -94,9 +99,6 @@ static void __init init_ISA_irqs(void) 
		desc->action = NULL;

		desc->depth = 1;



		/*

		 * 16 old-style INTA-cycle interrupts:

		 */

		set_irq_chip_and_handler_name(i, &i8259A_chip,

					      handle_level_irq, "XT");

	}