aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-09-25 22:22:12 -0700
committerIngo Molnar <mingo@elte.hu>2008-10-13 10:22:44 +0200
commit9b658f6f8bd30b91aec527325e398771511ea61b (patch)
tree17ae28e7e62e06323d4b55640df6de46f4825320
parent3c1326f8a6d8b9815ca88c95441330f96eef7352 (diff)
x86: cleanup, remove extra ifdef
also change two functions to static. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/irqinit_64.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/irqinit_64.c b/arch/x86/kernel/irqinit_64.c
index b01d9549b3d..5b5be9d43c2 100644
--- a/arch/x86/kernel/irqinit_64.c
+++ b/arch/x86/kernel/irqinit_64.c
@@ -164,7 +164,7 @@ void __init init_ISA_irqs(void)
void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ")));
-void __init smp_intr_init(void)
+static void __init smp_intr_init(void)
{
#ifdef CONFIG_SMP
/*
@@ -195,11 +195,9 @@ void __init smp_intr_init(void)
#endif
}
-void __init apic_intr_init(void)
+static void __init apic_intr_init(void)
{
-#ifdef CONFIG_SMP
smp_intr_init();
-#endif
alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);
alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt);