diff options
| author | njl <njl@FreeBSD.org> | 2005-05-20 17:16:24 +0000 |
|---|---|---|
| committer | njl <njl@FreeBSD.org> | 2005-05-20 17:16:24 +0000 |
| commit | 2b6ea027c9ec6abbbc6ddc5fd7e3471914c14a82 (patch) | |
| tree | 798eb449bfb14279496a419bfe203d3e38022740 | |
| parent | 5aa539228ea8f570b5d6b27c4ddce8e5396f3dca (diff) | |
| download | FreeBSD-src-2b6ea027c9ec6abbbc6ddc5fd7e3471914c14a82.zip FreeBSD-src-2b6ea027c9ec6abbbc6ddc5fd7e3471914c14a82.tar.gz | |
Fix LINT build, original breakage was rev 1.23. There are 2 definitions
of MCOUNT to have a C version and an asm version with the same name and
not have LOCORE ifdefs to distinguish them. <machine/profile.h> provides
a C version and <machine/asmacros.h> provides an assembler version.
Discussed with: bde
| -rw-r--r-- | sys/i386/isa/prof_machdep.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/i386/isa/prof_machdep.c b/sys/i386/isa/prof_machdep.c index 677ff0f..b286d7b 100644 --- a/sys/i386/isa/prof_machdep.c +++ b/sys/i386/isa/prof_machdep.c @@ -33,6 +33,14 @@ __FBSDID("$FreeBSD$"); #include <machine/asmacros.h> #include <machine/timerreg.h> +/* + * There are 2 definitions of MCOUNT to have a C version and an asm version + * with the same name and not have LOCORE #ifdefs to distinguish them. + * <machine/profile.h> provides a C version, and <machine/asmacros.h> + * provides an asm version. To avoid conflicts, #undef the asm version. + */ +#undef MCOUNT + #ifdef GUPROF #include "opt_i586_guprof.h" #include "opt_perfmon.h" @@ -44,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include <machine/clock.h> #include <machine/perfmon.h> #include <machine/profile.h> -#undef MCOUNT #define CPUTIME_CLOCK_UNINITIALIZED 0 #define CPUTIME_CLOCK_I8254 1 |
