Skip to contentSkip to conversation

x86: remove extra ifdef

PATCH Applied Yinghai Lu 2 participants 2 messages Sep 26, 2008 – Sep 27, 2008 x86

lore
Share & tools
lore

Yinghai Lu

author
#0 lore raw

PATCH 1/1 x86: remove extra ifdef

also change two func to static

---
 arch/x86/kernel/irqinit_64.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
arch/x86/kernel/irqinit_64.c +2 -4
index 7df020b..d17fbc2 100644
@@ -160,7 +160,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
 	/*
@@ -191,11 +191,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);
Signature · 1 line
1.5.6
Applied
#1 lore raw
Quoted 6 lines · Yinghai Lu

also change two func to static

---
 arch/x86/kernel/irqinit_64.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

applied to tip/x86/time, thanks Yinghai!

Ingo