x86: provide read and write cr8 paravirt hooks

[sfrench/cifs-2.6.git] / include / asm-x86 / system.h

diff --git a/include/asm-x86/system.h b/include/asm-x86/system.h
index 39474f2957a3c872a4b49202bd42eee08fc94763..ee32ef9367f4f25b1c87bf435d2c80ed8586c9c9 100644 (file)
--- a/include/asm-x86/system.h
+++ b/include/asm-x86/system.h
@@ -231,6 +231,20 @@ static inline void native_write_cr4(unsigned long val)
        asm volatile("mov %0,%%cr4": :"r" (val), "m" (__force_order));
 }
 
        asm volatile("mov %0,%%cr4": :"r" (val), "m" (__force_order));
 }
 

+#ifdef CONFIG_X86_64
+static inline unsigned long native_read_cr8(void)
+{
+       unsigned long cr8;
+       asm volatile("movq %%cr8,%0" : "=r" (cr8));
+       return cr8;
+}
+
+static inline void native_write_cr8(unsigned long val)
+{
+       asm volatile("movq %0,%%cr8" :: "r" (val) : "memory");
+}
+#endif
+

 static inline void native_wbinvd(void)
 {
        asm volatile("wbinvd": : :"memory");
 static inline void native_wbinvd(void)
 {
        asm volatile("wbinvd": : :"memory");


@@ -248,21 +262,9 @@ static inline void native_wbinvd(void)
 #define read_cr4_safe()        (native_read_cr4_safe())
 #define write_cr4(x)   (native_write_cr4(x))
 #define wbinvd()       (native_wbinvd())
 #define read_cr4_safe()        (native_read_cr4_safe())
 #define write_cr4(x)   (native_write_cr4(x))
 #define wbinvd()       (native_wbinvd())

-

 #ifdef CONFIG_X86_64
 #ifdef CONFIG_X86_64

-
-static inline unsigned long read_cr8(void)
-{
-       unsigned long cr8;
-       asm volatile("movq %%cr8,%0" : "=r" (cr8));
-       return cr8;
-}
-
-static inline void write_cr8(unsigned long val)
-{
-       asm volatile("movq %0,%%cr8" :: "r" (val) : "memory");
-}
-
+#define read_cr8()     (native_read_cr8())
+#define write_cr8(x)   (native_write_cr8(x))

 #endif
 
 /* Clear the 'TS' bit */
 #endif
 
 /* Clear the 'TS' bit */