summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2009-11-01 17:45:37 +0000
committeravg <avg@FreeBSD.org>2009-11-01 17:45:37 +0000
commitc8f0456bbb423d4a66a049f99b5edaabde6bc7a0 (patch)
tree3dbedd62866168caed46a97b1d6dd68051ff2bb7
parent15483eb6ad6f1755fab940033cf5e375e886fa66 (diff)
downloadFreeBSD-src-c8f0456bbb423d4a66a049f99b5edaabde6bc7a0.zip
FreeBSD-src-c8f0456bbb423d4a66a049f99b5edaabde6bc7a0.tar.gz
MFC 197647: cpufunc.h: unify/correct style of c extension names
-rw-r--r--sys/amd64/include/cpufunc.h6
-rw-r--r--sys/i386/include/cpufunc.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index eb264ae..dee78cb 100644
--- a/sys/amd64/include/cpufunc.h
+++ b/sys/amd64/include/cpufunc.h
@@ -277,7 +277,7 @@ static __inline void
mfence(void)
{
- __asm__ __volatile("mfence" : : : "memory");
+ __asm __volatile("mfence" : : : "memory");
}
static __inline void
@@ -457,14 +457,14 @@ load_es(u_int sel)
__asm __volatile("mov %0,%%es" : : "rm" (sel));
}
-static inline void
+static __inline void
cpu_monitor(const void *addr, int extensions, int hints)
{
__asm __volatile("monitor;"
: :"a" (addr), "c" (extensions), "d"(hints));
}
-static inline void
+static __inline void
cpu_mwait(int extensions, int hints)
{
__asm __volatile("mwait;" : :"a" (hints), "c" (extensions));
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index 147040b..78863d1 100644
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
@@ -132,14 +132,14 @@ enable_intr(void)
#endif
}
-static inline void
+static __inline void
cpu_monitor(const void *addr, int extensions, int hints)
{
__asm __volatile("monitor;"
: :"a" (addr), "c" (extensions), "d"(hints));
}
-static inline void
+static __inline void
cpu_mwait(int extensions, int hints)
{
__asm __volatile("mwait;" : :"a" (hints), "c" (extensions));
OpenPOWER on IntegriCloud