svn commit: r197647 - in head/sys: amd64/include i386/include

[Andriy Gapon]

Author: avg
Date: Wed Sep 30 16:34:50 2009
New Revision: 197647
URL: http://svn.freebsd.org/changeset/base/197647

Log:
  cpufunc.h: unify/correct style of c extension names
  
  i386 and amd64 archs only.
  inline => __inline. [1]
  __asm__ => __asm. [2]
  
  Reviewed by:	kib, jhb [1]
  Suggested by:	kib [2]
  MFC after:	1 week

Modified:
  head/sys/amd64/include/cpufunc.h
  head/sys/i386/include/cpufunc.h

Modified: head/sys/amd64/include/cpufunc.h
==============================================================================
--- head/sys/amd64/include/cpufunc.h	Wed Sep 30 14:58:10 2009	(r197646)
+++ head/sys/amd64/include/cpufunc.h	Wed Sep 30 16:34:50 2009	(r197647)
@@ -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));

Modified: head/sys/i386/include/cpufunc.h
==============================================================================
--- head/sys/i386/include/cpufunc.h	Wed Sep 30 14:58:10 2009	(r197646)
+++ head/sys/i386/include/cpufunc.h	Wed Sep 30 16:34:50 2009	(r197647)
@@ -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));