2 files changed, 26 insertions, 0 deletions

diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index 2c5fcb2acda1..ac0db87ee2fc 100644
--- a/sys/amd64/include/cpufunc.h
+++ b/sys/amd64/include/cpufunc.h
@@ -514,6 +514,19 @@ load_es(u_int sel)
 	__asm __volatile("movl %0,%%es" : : "rm" (sel));
 }
 
+static inline void
+cpu_monitor(const void *addr, int extensions, int hints)
+{
+	__asm __volatile("monitor;"
+	    : :"a" (addr), "c" (extensions), "d"(hints));
+}
+
+static inline void
+cpu_mwait(int extensions, int hints)
+{
+	__asm __volatile("mwait;" : :"a" (hints), "c" (extensions));
+}
+
 #ifdef _KERNEL
 /* This is defined in <machine/specialreg.h> but is too painful to get to */
 #ifndef	MSR_FSBASE
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index f3f671503a3b..85b3f3dfad33 100644
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
@@ -106,6 +106,19 @@ enable_intr(void)
 	__asm __volatile("sti");
 }
 
+static inline void
+cpu_monitor(const void *addr, int extensions, int hints)
+{
+	__asm __volatile("monitor;"
+	    : :"a" (addr), "c" (extensions), "d"(hints));
+}
+
+static inline void
+cpu_mwait(int extensions, int hints)
+{
+	__asm __volatile("mwait;" : :"a" (hints), "c" (extensions));
+}
+
 #ifdef _KERNEL
 
 #define	HAVE_INLINE_FFS