[PATCH 07/13] x86: unify init_ISA_irqs() in irqinit_{32,64}.c

Pekka Enberg
2009-04-07T17:39:21Z

arch/x86/kernel/irqinit_32.c | 2 +-
arch/x86/kernel/irqinit_64.c | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c
index ef2528d..4488b71 100644
--- a/arch/x86/kernel/irqinit_32.c
+++ b/arch/x86/kernel/irqinit_32.c
@@ -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);
diff --git a/arch/x86/kernel/irqinit_64.c b/arch/x86/kernel/irqinit_64.c
index 9e7c57d..61c9a92 100644
--- a/arch/x86/kernel/irqinit_64.c
+++ b/arch/x86/kernel/irqinit_64.c
@@ -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,11 +99,8 @@ 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");
+ handle_level_irq, "XT");
}
}

--
1.5.6.3