summaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
authorMatthew Dillon <dillon@FreeBSD.org>2000-03-28 18:06:49 +0000
committerMatthew Dillon <dillon@FreeBSD.org>2000-03-28 18:06:49 +0000
commitdb6a42615881d284f8622182d8e9145f040056b5 (patch)
tree8630fc05f4bf872a26289299a59114adfec3c373 /sys/kern
parent7791c9212c4c2a9f0a26209abf1864025e84360a (diff)
Notes
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/kern_clock.c4
-rw-r--r--sys/kern/kern_mib.c3
-rw-r--r--sys/kern/kern_shutdown.c2
-rw-r--r--sys/kern/kern_sig.c2
-rw-r--r--sys/kern/kern_synch.c2
5 files changed, 1 insertions, 12 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index d8066a7daa6c..dc1ea6df4b26 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -60,14 +60,12 @@
#include <machine/cpu.h>
#include <machine/limits.h>
+#include <machine/smp.h>
#ifdef GPROF
#include <sys/gmon.h>
#endif
-#if defined(SMP) && defined(BETTER_CLOCK)
-#include <machine/smp.h>
-#endif
static void initclocks __P((void *dummy));
SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL)
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index 2d5217c55958..a07988e829ff 100644
--- a/sys/kern/kern_mib.c
+++ b/sys/kern/kern_mib.c
@@ -46,10 +46,7 @@
#include <sys/sysctl.h>
#include <sys/proc.h>
#include <sys/jail.h>
-
-#if defined(SMP)
#include <machine/smp.h>
-#endif
SYSCTL_NODE(, 0, sysctl, CTLFLAG_RW, 0,
"Sysctl internal magic");
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index f5940ac3e019..e4a4696ccbee 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -63,9 +63,7 @@
#include <machine/pcb.h>
#include <machine/clock.h>
#include <machine/md_var.h>
-#ifdef SMP
#include <machine/smp.h> /* smp_active, cpuid */
-#endif
#include <sys/signalvar.h>
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index b374fed75506..a8b7ceeeb209 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -66,9 +66,7 @@
#include <machine/ipl.h>
#include <machine/cpu.h>
-#ifdef SMP
#include <machine/smp.h>
-#endif
#define ONSIG 32 /* NSIG for osig* syscalls. XXX. */
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index d7a66b03ad74..3ae903d39d52 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -58,9 +58,7 @@
#include <machine/cpu.h>
#include <machine/ipl.h>
-#ifdef SMP
#include <machine/smp.h>
-#endif
static void sched_setup __P((void *dummy));
SYSINIT(sched_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, sched_setup, NULL)