Fix low res profiling kernel build. Move two defines to collapse the

#ifdef GUPROF case.
This commit is contained in:
Nate Lawson 2005-05-19 05:22:52 +00:00
parent faf0d4eb71
commit c363ab2430

View File

@ -27,12 +27,16 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <machine/asmacros.h>
#include <machine/timerreg.h>
#ifdef GUPROF #ifdef GUPROF
#include "opt_i586_guprof.h" #include "opt_i586_guprof.h"
#include "opt_perfmon.h" #include "opt_perfmon.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/gmon.h> #include <sys/gmon.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
@ -41,12 +45,7 @@ __FBSDID("$FreeBSD$");
#include <machine/perfmon.h> #include <machine/perfmon.h>
#include <machine/profile.h> #include <machine/profile.h>
#undef MCOUNT #undef MCOUNT
#endif
#include <machine/asmacros.h>
#include <machine/timerreg.h>
#ifdef GUPROF
#define CPUTIME_CLOCK_UNINITIALIZED 0 #define CPUTIME_CLOCK_UNINITIALIZED 0
#define CPUTIME_CLOCK_I8254 1 #define CPUTIME_CLOCK_I8254 1
#define CPUTIME_CLOCK_TSC 2 #define CPUTIME_CLOCK_TSC 2