lkml.org 
[lkml]   [2009]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 13/13] x86: remove some ifdefs from native_init_IRQ()
Date
Impact: cleanup

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
arch/x86/kernel/irqinit.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c
index f2c60a5..6269772 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
--
1.5.6.3


\
 
 \ /
  Last update: 2009-04-07 19:43    [from the cache]
©2003-2011 Jasper Spaans