From b582496fba1c71ac5eaf5c20919f1f415a239b4d Mon Sep 17 00:00:00 2001
From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Mon, 6 Jun 2011 18:18:45 +0800
Subject: [PATCH] i386: Remove unnecessary #ifdef SMP from files compiled with
 options SMP

---
 sys/platform/pc32/apic/apic_vector.s | 8 --------
 sys/platform/pc32/apic/ioapic_abi.c  | 4 ----
 sys/platform/pc32/apic/ioapic_ipl.s  | 4 ----
 sys/platform/pc32/i386/mp_machdep.c  | 6 ------
 4 files changed, 22 deletions(-)

diff --git a/sys/platform/pc32/apic/apic_vector.s b/sys/platform/pc32/apic/apic_vector.s
index 0bf308a19c..07c42a81da 100644
--- a/sys/platform/pc32/apic/apic_vector.s
+++ b/sys/platform/pc32/apic/apic_vector.s
@@ -115,8 +115,6 @@
 	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 */
diff --git a/sys/platform/pc32/apic/ioapic_abi.c b/sys/platform/pc32/apic/ioapic_abi.c
index 24d280ece2..9f32fbef6a 100644
--- a/sys/platform/pc32/apic/ioapic_abi.c
+++ b/sys/platform/pc32/apic/ioapic_abi.c
@@ -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 */
diff --git a/sys/platform/pc32/apic/ioapic_ipl.s b/sys/platform/pc32/apic/ioapic_ipl.s
index a221376c2d..86f06fb87d 100644
--- a/sys/platform/pc32/apic/ioapic_ipl.s
+++ b/sys/platform/pc32/apic/ioapic_ipl.s
@@ -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
diff --git a/sys/platform/pc32/i386/mp_machdep.c b/sys/platform/pc32/i386/mp_machdep.c
index e3503f3a22..94725cfd08 100644
--- a/sys/platform/pc32/i386/mp_machdep.c
+++ b/sys/platform/pc32/i386/mp_machdep.c
@@ -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.
-- 
2.41.0