i386: Remove unnecessary #ifdef SMP from files compiled with options SMP
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Mon, 6 Jun 2011 10:18:45 +0000 (18:18 +0800)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Mon, 6 Jun 2011 10:24:38 +0000 (18:24 +0800)
sys/platform/pc32/apic/apic_vector.s
sys/platform/pc32/apic/ioapic_abi.c
sys/platform/pc32/apic/ioapic_ipl.s
sys/platform/pc32/i386/mp_machdep.c

index 0bf308a..07c42a8 100644 (file)
        IOAPIC_IMASK_UNLOCK ;                                           \
 8: ;                                                                   \
 
-#ifdef SMP /* APIC-IO */
-
 /*
  * Interrupt call handlers run in the following sequence:
  *
@@ -169,8 +167,6 @@ IDTVEC(ioapic_intr##irq_num) ;                                              \
        MEXITCOUNT ;                                                    \
        jmp     doreti ;                                                \
 
-#endif
-
 /*
  * Handle "spurious INTerrupts".
  * Notes:
@@ -359,8 +355,6 @@ Xtimer:
        MEXITCOUNT
        jmp     doreti_syscall_ret
 
-#ifdef SMP /* APIC-IO */
-
 MCOUNT_LABEL(bintr)
        INTR_HANDLER(0)
        INTR_HANDLER(1)
@@ -556,8 +550,6 @@ MCOUNT_LABEL(bintr)
        INTR_HANDLER(191)
 MCOUNT_LABEL(eintr)
 
-#endif
-
        .data
 
 /* variables used by stop_cpus()/restart_cpus()/Xcpustop */
index 24d280e..9f32fbe 100644 (file)
@@ -61,8 +61,6 @@
 #include <machine_base/apic/ioapic_abi.h>
 #include <machine_base/apic/ioapic_ipl.h>
 
-#ifdef SMP /* APIC-IO */
-
 extern inthand_t
        IDTVEC(ioapic_intr0),
        IDTVEC(ioapic_intr1),
@@ -925,5 +923,3 @@ ioapic_abi_extint_irqmap(int irq)
 
        return 0;
 }
-
-#endif /* SMP */
index a221376..86f06fb 100644 (file)
@@ -66,8 +66,6 @@
 #include <machine_base/apic/ioapic_ipl.h>
 #include "assym.s"
 
-#ifdef SMP /* APIC-IO */
-
        .text
        SUPERALIGN_TEXT
 
@@ -133,5 +131,3 @@ ENTRY(ioapic_write)
        movl    12(%esp), %eax          /* target register value */
        movl    %eax, IOAPIC_WINDOW(%edx) /* write the IOAPIC register data */
        ret                             /* %eax = void */
-
-#endif
index e3503f3..94725cf 100644 (file)
@@ -757,7 +757,6 @@ static cpumask_t smp_invltlb_req;
 void
 smp_invltlb(void)
 {
-#ifdef SMP
        struct mdglobaldata *md = mdcpu;
 #ifdef SMP_INVLTLB_DEBUG
        long count = 0;
@@ -817,11 +816,8 @@ again:
        }
        atomic_clear_cpumask(&smp_invltlb_req, md->mi.gd_cpumask);
        crit_exit_gd(&md->mi);
-#endif
 }
 
-#ifdef SMP
-
 /*
  * Called from Xinvltlb assembly with interrupts disabled.  We didn't
  * bother to bump the critical section count or nested interrupt count
@@ -846,8 +842,6 @@ smp_invltlb_intr(void)
        }
 }
 
-#endif
-
 /*
  * When called the executing CPU will send an IPI to all other CPUs
  *  requesting that they halt execution.