diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-09-26 01:22:12 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 04:22:44 -0400 |
commit | 9b658f6f8bd30b91aec527325e398771511ea61b (patch) | |
tree | 17ae28e7e62e06323d4b55640df6de46f4825320 | |
parent | 3c1326f8a6d8b9815ca88c95441330f96eef7352 (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.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/irqinit_64.c b/arch/x86/kernel/irqinit_64.c index b01d9549b3d4..5b5be9d43c2a 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) | |||
164 | 164 | ||
165 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); | 165 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); |
166 | 166 | ||
167 | void __init smp_intr_init(void) | 167 | static void __init smp_intr_init(void) |
168 | { | 168 | { |
169 | #ifdef CONFIG_SMP | 169 | #ifdef CONFIG_SMP |
170 | /* | 170 | /* |
@@ -195,11 +195,9 @@ void __init smp_intr_init(void) | |||
195 | #endif | 195 | #endif |
196 | } | 196 | } |
197 | 197 | ||
198 | void __init apic_intr_init(void) | 198 | static void __init apic_intr_init(void) |
199 | { | 199 | { |
200 | #ifdef CONFIG_SMP | ||
201 | smp_intr_init(); | 200 | smp_intr_init(); |
202 | #endif | ||
203 | 201 | ||
204 | alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt); | 202 | alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt); |
205 | alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt); | 203 | alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt); |