From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Fri, 26 Sep 2008 05:22:12 +0000 (-0700)
Subject: x86: cleanup, remove extra ifdef
X-Git-Tag: v2.6.28-rc1~611^2~37
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9b658f6f8bd30b91aec527325e398771511ea61b;p=linux-2.6-omap-h63xx.git

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>
---

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);