summaryrefslogtreecommitdiff
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2009-04-09 11:52:30 +0300
committerIngo Molnar <mingo@elte.hu>2009-04-10 14:35:59 +0200
commitabdb5a5713330e17dfe91ab0d3e29c4744d95162 (patch)
treeb8bf7814bdd4aa5c3d65d16457a6994c854ad134 /arch/x86/kernel
parentac3048dfd4740becf8d768844cf47ebee363c9f8 (diff)
x86: remove some ifdefs from native_init_IRQ()
Impact: cleanup Reviewed-by Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/irqinit.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c
index f2c60a59f474..626977200a58 100644
--- a/arch/x86/kernel/irqinit.c
+++ b/arch/x86/kernel/irqinit.c
@@ -205,7 +205,6 @@ static void __init apic_intr_init(void)
#endif
}
-#ifdef CONFIG_X86_32
/**
* x86_quirk_pre_intr_init - initialisation prior to setting up interrupt vectors
*
@@ -217,24 +216,21 @@ static void __init apic_intr_init(void)
**/
static void __init x86_quirk_pre_intr_init(void)
{
+#ifdef CONFIG_X86_32
if (x86_quirks->arch_pre_intr_init) {
if (x86_quirks->arch_pre_intr_init())
return;
}
+#endif
init_ISA_irqs();
}
-#endif
void __init native_init_IRQ(void)
{
int i;
-#ifdef CONFIG_X86_32
/* Execute any quirks before the call gates are initialised: */
x86_quirk_pre_intr_init();
-#else
- init_ISA_irqs();
-#endif
/*
* Cover the whole vector space, no vector can escape