system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-18 14:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix LINT build, original breakage was rev 1.23. There are 2 definitions

Browse source 
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
This commit is contained in:
Nate Lawson 2005-05-20 17:16:24 +00:00
parent c8dddf0d55
commit b3a9f68f8c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=146458
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/i386/isa/prof_machdep.c
View file

@ -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