aboutsummaryrefslogtreecommitdiff
path: root/sys/i386
diff options
context:
space:
mode:
authorNate Lawson <njl@FreeBSD.org>2005-05-19 05:22:52 +0000
committerNate Lawson <njl@FreeBSD.org>2005-05-19 05:22:52 +0000
commitc363ab24305ad129976fc527d1624f8143c3fab7 (patch)
treee4b8984452fee4a65f5be5312a39f90aef185403 /sys/i386
parentfaf0d4eb71b00aad55a26a845d5e630d404dba8f (diff)
downloadsrc-c363ab24305ad129976fc527d1624f8143c3fab7.tar.gz
src-c363ab24305ad129976fc527d1624f8143c3fab7.zip
Fix low res profiling kernel build. Move two defines to collapse the
#ifdef GUPROF case.
Notes
Notes: svn path=/head/; revision=146366
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/isa/prof_machdep.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/i386/isa/prof_machdep.c b/sys/i386/isa/prof_machdep.c
index 41c361accb7e..677ff0f20ac9 100644
--- a/sys/i386/isa/prof_machdep.c
+++ b/sys/i386/isa/prof_machdep.c
@@ -27,12 +27,16 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/param.h>
+#include <sys/systm.h>
+
+#include <machine/asmacros.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>
@@ -41,12 +45,7 @@ __FBSDID("$FreeBSD$");
#include <machine/perfmon.h>
#include <machine/profile.h>
#undef MCOUNT
-#endif
-
-#include <machine/asmacros.h>
-#include <machine/timerreg.h>
-#ifdef GUPROF
#define CPUTIME_CLOCK_UNINITIALIZED 0
#define CPUTIME_CLOCK_I8254 1
#define CPUTIME_CLOCK_TSC 2