summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjake <jake@FreeBSD.org>2002-03-07 04:43:51 +0000
committerjake <jake@FreeBSD.org>2002-03-07 04:43:51 +0000
commit96a2ab54a0fa8b4d800a76dd9507b2e12f3ae3bb (patch)
tree5c599ca25a8dcb1b72892a1f7d4363d964ed0edf /sys
parent446c57926d35006b63b1679564b302a463677e06 (diff)
downloadFreeBSD-src-96a2ab54a0fa8b4d800a76dd9507b2e12f3ae3bb.zip
FreeBSD-src-96a2ab54a0fa8b4d800a76dd9507b2e12f3ae3bb.tar.gz
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.
Diffstat (limited to 'sys')
-rw-r--r--sys/alpha/alpha/interrupt.c1
-rw-r--r--sys/alpha/alpha/mp_machdep.c1
-rw-r--r--sys/amd64/amd64/mp_machdep.c1
-rw-r--r--sys/amd64/amd64/mptable.c1
-rw-r--r--sys/amd64/include/mptable.h1
-rw-r--r--sys/i386/i386/mp_machdep.c1
-rw-r--r--sys/i386/i386/mptable.c1
-rw-r--r--sys/i386/include/mptable.h1
-rw-r--r--sys/kern/kern_shutdown.c1
-rw-r--r--sys/kern/subr_smp.c2
-rw-r--r--sys/sys/smp.h1
11 files changed, 11 insertions, 1 deletions
diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c
index b33afa8..0c6a73d 100644
--- a/sys/alpha/alpha/interrupt.c
+++ b/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. */
diff --git a/sys/alpha/alpha/mp_machdep.c b/sys/alpha/alpha/mp_machdep.c
index d899462..9ad8966 100644
--- a/sys/alpha/alpha/mp_machdep.c
+++ b/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;
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index d775e7d..e3dd31a 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/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>
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index d775e7d..e3dd31a 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/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>
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index d775e7d..e3dd31a 100644
--- a/sys/amd64/include/mptable.h
+++ b/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>
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index d775e7d..e3dd31a 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/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>
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index d775e7d..e3dd31a 100644
--- a/sys/i386/i386/mptable.c
+++ b/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>
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index d775e7d..e3dd31a 100644
--- a/sys/i386/include/mptable.h
+++ b/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>
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 895a238..1249391 100644
--- a/sys/kern/kern_shutdown.c
+++ b/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
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 1d90fe8..aa1d782 100644
--- a/sys/kern/subr_smp.c
+++ b/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;
diff --git a/sys/sys/smp.h b/sys/sys/smp.h
index e829719..21c67f4 100644
--- a/sys/sys/smp.h
+++ b/sys/sys/smp.h
@@ -13,7 +13,6 @@
#define _SYS_SMP_H_
#ifdef _KERNEL
-#include <machine/smp.h>
#ifndef LOCORE
OpenPOWER on IntegriCloud