From 4b616c33a842304be7a1fc19c3505be8dd726f8e Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Sat, 28 Oct 2006 06:38:51 +0000
Subject: Cleaned up includes.  <machine/profile.h> was unused. 
 <machine/timerreg.h> was only used in the GUPROF case, so the messes to get
 its i386 prerequisites included shouldn't have been needed.

Fixed some style bugs. Quote #error contents, and don't repeat an #error
directive on amd64.
---
 sys/amd64/amd64/prof_machdep.c |  8 +-------
 sys/i386/isa/prof_machdep.c    | 11 ++++-------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/sys/amd64/amd64/prof_machdep.c b/sys/amd64/amd64/prof_machdep.c
index b0ef17c..41c04d7 100644
--- a/sys/amd64/amd64/prof_machdep.c
+++ b/sys/amd64/amd64/prof_machdep.c
@@ -43,12 +43,8 @@ __FBSDID("$FreeBSD$");
 #if 0
 #include <machine/perfmon.h>
 #endif
-#include <machine/profile.h>
-#endif
-
 #include <machine/timerreg.h>
 
-#ifdef GUPROF
 #define	CPUTIME_CLOCK_UNINITIALIZED	0
 #define	CPUTIME_CLOCK_I8254		1
 #define	CPUTIME_CLOCK_TSC		2
@@ -137,7 +133,7 @@ __cyg_profile_func_enter:					\n\
 	ret							\n\
 ");
 #else /* !__GNUCLIKE_ASM */
-#error this file needs to be ported to your compiler
+#error "this file needs to be ported to your compiler"
 #endif /* __GNUCLIKE_ASM */
 
 #ifdef GUPROF
@@ -190,8 +186,6 @@ __cyg_profile_func_exit:					\n\
 .mexitcount_exit:						\n\
 	ret							\n\
 ");
-#else /* !__GNUCLIKE_ASM */
-#error this file needs to be ported to your compiler
 #endif /* __GNUCLIKE_ASM */
 
 /*
diff --git a/sys/i386/isa/prof_machdep.c b/sys/i386/isa/prof_machdep.c
index 393c5ca..8b19340 100644
--- a/sys/i386/isa/prof_machdep.c
+++ b/sys/i386/isa/prof_machdep.c
@@ -27,22 +27,19 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
-#include <sys/systm.h>
-
-#include <machine/timerreg.h>
-
 #ifdef GUPROF
 #include "opt_i586_guprof.h"
 #include "opt_perfmon.h"
 
+#include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/gmon.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 
 #include <machine/clock.h>
 #include <machine/perfmon.h>
-#include <machine/profile.h>
+#include <machine/timerreg.h>
 
 #define	CPUTIME_CLOCK_UNINITIALIZED	0
 #define	CPUTIME_CLOCK_I8254		1
@@ -114,7 +111,7 @@ __cyg_profile_func_enter:					\n\
 	ret							\n\
 ");
 #else /* !__GNUCLIKE_ASM */
-#error this file needs to be ported to your compiler
+#error "this file needs to be ported to your compiler"
 #endif /* __GNUCLIKE_ASM */
 
 #ifdef GUPROF
-- 
cgit v1.1