diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2002-05-22 20:32:39 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2002-05-22 20:32:39 +0000 |
| commit | 6b8c698908a451a9a5363c896d2504658181e6d4 (patch) | |
| tree | 08151c57646bcea9a9226d45cf36d0066a2a1933 /sys/amd64/include/cpufunc.h | |
| parent | 540e5c2eaf3f6f2aa561e109b943f0041bb985b2 (diff) | |
| download | src-6b8c698908a451a9a5363c896d2504658181e6d4.tar.gz src-6b8c698908a451a9a5363c896d2504658181e6d4.zip | |
Rename pause() to ia32_pause() so it doesn't conflict with the pause()
function defined in <unistd.h>. I didn't #ifdef _KERNEL it because the
mutex implementation in libpthread will probably need this.
Notes
Notes:
svn path=/head/; revision=97139
Diffstat (limited to 'sys/amd64/include/cpufunc.h')
| -rw-r--r-- | sys/amd64/include/cpufunc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index 98f0ed8bb5f5..2e64138de4c7 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -358,7 +358,7 @@ outw(u_int port, u_short data) } static __inline void -pause(void) +ia32_pause(void) { __asm __volatile("pause"); } @@ -605,7 +605,7 @@ void outsb(u_int port, void *addr, size_t cnt); void outsl(u_int port, void *addr, size_t cnt); void outsw(u_int port, void *addr, size_t cnt); void outw(u_int port, u_short data); -void pause(void); +void ia32_pause(void); u_int rcr2(void); u_int64_t rdmsr(u_int msr); u_int64_t rdpmc(u_int pmc); |