summaryrefslogtreecommitdiffstats
path: root/sys/amd64/include/cpufunc.h
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2002-05-22 20:32:39 +0000
committerjhb <jhb@FreeBSD.org>2002-05-22 20:32:39 +0000
commit096c0249dc8295a7a40933495392d2e1d5342831 (patch)
tree08151c57646bcea9a9226d45cf36d0066a2a1933 /sys/amd64/include/cpufunc.h
parent6819a7b589dd9fb34ba8d012aa55be2e741e081a (diff)
downloadFreeBSD-src-096c0249dc8295a7a40933495392d2e1d5342831.zip
FreeBSD-src-096c0249dc8295a7a40933495392d2e1d5342831.tar.gz
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.
Diffstat (limited to 'sys/amd64/include/cpufunc.h')
-rw-r--r--sys/amd64/include/cpufunc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index 98f0ed8..2e64138 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);
OpenPOWER on IntegriCloud