Add needed includes of machine/smp.h, remove nested include in sys/smp.h

so that inlines in machine/smp.h can use variables declared in sys/smp.h.

sys/alpha/alpha/interrupt.c

@@ -60,6 +60,7 @@
 #include <machine/bwx.h>
 #include <machine/intr.h>
 #include <machine/rpb.h>
+#include <machine/smp.h>
 
 #ifdef EVCNT_COUNTERS
 struct evcnt clock_intr_evcnt;	/* event counter for clock intrs. */

sys/alpha/alpha/mp_machdep.c

@@ -50,6 +50,7 @@
 #include <machine/rpb.h>
 #include <machine/clock.h>
 #include <machine/prom.h>
+#include <machine/smp.h>
 
 /* Set to 1 once we're ready to let the APs out of the pen. */
 static volatile int aps_ready = 0;

sys/amd64/amd64/mp_machdep.c

@@ -68,6 +68,7 @@
 #include <machine/mpapic.h>
 #include <machine/psl.h>
 #include <machine/segments.h>
+#include <machine/smp.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>

sys/amd64/amd64/mptable.c

@@ -68,6 +68,7 @@
 #include <machine/mpapic.h>
 #include <machine/psl.h>
 #include <machine/segments.h>
+#include <machine/smp.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>

sys/amd64/include/mptable.h

@@ -68,6 +68,7 @@
 #include <machine/mpapic.h>
 #include <machine/psl.h>
 #include <machine/segments.h>
+#include <machine/smp.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>

sys/i386/i386/mp_machdep.c

@@ -68,6 +68,7 @@
 #include <machine/mpapic.h>
 #include <machine/psl.h>
 #include <machine/segments.h>
+#include <machine/smp.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>

sys/i386/i386/mptable.c

@@ -68,6 +68,7 @@
 #include <machine/mpapic.h>
 #include <machine/psl.h>
 #include <machine/segments.h>
+#include <machine/smp.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>

sys/i386/include/mptable.h

@@ -68,6 +68,7 @@
 #include <machine/mpapic.h>
 #include <machine/psl.h>
 #include <machine/segments.h>
+#include <machine/smp.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>

sys/kern/kern_shutdown.c

@@ -66,6 +66,7 @@
 
 #include <machine/pcb.h>
 #include <machine/md_var.h>
+#include <machine/smp.h>
 
 #include <sys/signalvar.h>
 #ifdef DDB

sys/kern/subr_smp.c

@@ -45,6 +45,8 @@
 #include <sys/smp.h>
 #include <sys/sysctl.h>
 
+#include <machine/smp.h>
+
 volatile u_int stopped_cpus;
 volatile u_int started_cpus;
 

sys/sys/smp.h

@@ -13,7 +13,6 @@
 #define _SYS_SMP_H_
 
 #ifdef _KERNEL
-#include <machine/smp.h>
 
 #ifndef LOCORE