From 41d022ae9cfeef6e9acf3b9a1bffe3de9f5c3384 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Tue, 18 Nov 1997 11:16:56 +0000
Subject: [PATCH] Removed #unused includes.

Added a used #include (don't depend on yet to be fixed namespace pollution).
---
 sys/amd64/amd64/tsc.c | 7 ++++---
 sys/amd64/isa/clock.c | 7 ++++---
 sys/i386/i386/tsc.c   | 7 ++++---
 sys/i386/isa/clock.c  | 7 ++++---
 sys/isa/atrtc.c       | 7 ++++---
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index b8ad0c15c7be..97d5ae693ef0 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.102 1997/09/01 07:45:23 fsmp Exp $
+ *	$Id: clock.c,v 1.103 1997/10/28 11:43:57 bde Exp $
  */
 
 /*
@@ -49,12 +49,14 @@
  */
 
 #include "opt_clock.h"
-#include "opt_cpu.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
+#ifndef SMP
+#include <sys/lock.h>
+#endif
 #include <sys/sysctl.h>
 
 #include <machine/clock.h>
@@ -77,7 +79,6 @@
 #include <i386/isa/rtc.h>
 #include <i386/isa/timerreg.h>
 
-#include <i386/isa/intr_machdep.h>
 #include <sys/interrupt.h>
 
 #ifdef SMP
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index b8ad0c15c7be..97d5ae693ef0 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.102 1997/09/01 07:45:23 fsmp Exp $
+ *	$Id: clock.c,v 1.103 1997/10/28 11:43:57 bde Exp $
  */
 
 /*
@@ -49,12 +49,14 @@
  */
 
 #include "opt_clock.h"
-#include "opt_cpu.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
+#ifndef SMP
+#include <sys/lock.h>
+#endif
 #include <sys/sysctl.h>
 
 #include <machine/clock.h>
@@ -77,7 +79,6 @@
 #include <i386/isa/rtc.h>
 #include <i386/isa/timerreg.h>
 
-#include <i386/isa/intr_machdep.h>
 #include <sys/interrupt.h>
 
 #ifdef SMP
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index b8ad0c15c7be..97d5ae693ef0 100644
--- a/sys/i386/i386/tsc.c
+++ b/sys/i386/i386/tsc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.102 1997/09/01 07:45:23 fsmp Exp $
+ *	$Id: clock.c,v 1.103 1997/10/28 11:43:57 bde Exp $
  */
 
 /*
@@ -49,12 +49,14 @@
  */
 
 #include "opt_clock.h"
-#include "opt_cpu.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
+#ifndef SMP
+#include <sys/lock.h>
+#endif
 #include <sys/sysctl.h>
 
 #include <machine/clock.h>
@@ -77,7 +79,6 @@
 #include <i386/isa/rtc.h>
 #include <i386/isa/timerreg.h>
 
-#include <i386/isa/intr_machdep.h>
 #include <sys/interrupt.h>
 
 #ifdef SMP
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index b8ad0c15c7be..97d5ae693ef0 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.102 1997/09/01 07:45:23 fsmp Exp $
+ *	$Id: clock.c,v 1.103 1997/10/28 11:43:57 bde Exp $
  */
 
 /*
@@ -49,12 +49,14 @@
  */
 
 #include "opt_clock.h"
-#include "opt_cpu.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
+#ifndef SMP
+#include <sys/lock.h>
+#endif
 #include <sys/sysctl.h>
 
 #include <machine/clock.h>
@@ -77,7 +79,6 @@
 #include <i386/isa/rtc.h>
 #include <i386/isa/timerreg.h>
 
-#include <i386/isa/intr_machdep.h>
 #include <sys/interrupt.h>
 
 #ifdef SMP
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c
index b8ad0c15c7be..97d5ae693ef0 100644
--- a/sys/isa/atrtc.c
+++ b/sys/isa/atrtc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.102 1997/09/01 07:45:23 fsmp Exp $
+ *	$Id: clock.c,v 1.103 1997/10/28 11:43:57 bde Exp $
  */
 
 /*
@@ -49,12 +49,14 @@
  */
 
 #include "opt_clock.h"
-#include "opt_cpu.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
+#ifndef SMP
+#include <sys/lock.h>
+#endif
 #include <sys/sysctl.h>
 
 #include <machine/clock.h>
@@ -77,7 +79,6 @@
 #include <i386/isa/rtc.h>
 #include <i386/isa/timerreg.h>
 
-#include <i386/isa/intr_machdep.h>
 #include <sys/interrupt.h>
 
 #ifdef SMP