x86/paravirt: Add _safe to the read_ms()r and write_msr() PV callbacks

[deliverable/linux.git] / arch / x86 / include / asm / paravirt.h

diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 601f1b8f9961af35f113ad456b1ab90f1aceaced..81ef2d5c2a24878d288c034b052f4785ef1b287c 100644 (file)
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -130,34 +130,35 @@ static inline void wbinvd(void)
 
 #define get_kernel_rpl()  (pv_info.kernel_rpl)
 
-static inline u64 paravirt_read_msr(unsigned msr, int *err)
+static inline u64 paravirt_read_msr_safe(unsigned msr, int *err)
 {
-       return PVOP_CALL2(u64, pv_cpu_ops.read_msr, msr, err);
+       return PVOP_CALL2(u64, pv_cpu_ops.read_msr_safe, msr, err);
 }
 
-static inline int paravirt_write_msr(unsigned msr, unsigned low, unsigned high)
+static inline int paravirt_write_msr_safe(unsigned msr,
+                                         unsigned low, unsigned high)
 {
-       return PVOP_CALL3(int, pv_cpu_ops.write_msr, msr, low, high);
+       return PVOP_CALL3(int, pv_cpu_ops.write_msr_safe, msr, low, high);
 }
 
 /* These should all do BUG_ON(_err), but our headers are too tangled. */
 #define rdmsr(msr, val1, val2)                 \
 do {                                           \
        int _err;                               \
-       u64 _l = paravirt_read_msr(msr, &_err); \
+       u64 _l = paravirt_read_msr_safe(msr, &_err);    \
        val1 = (u32)_l;                         \
        val2 = _l >> 32;                        \
 } while (0)
 
 #define wrmsr(msr, val1, val2)                 \
 do {                                           \
-       paravirt_write_msr(msr, val1, val2);    \
+       paravirt_write_msr_safe(msr, val1, val2);       \
 } while (0)
 
 #define rdmsrl(msr, val)                       \
 do {                                           \
        int _err;                               \
-       val = paravirt_read_msr(msr, &_err);    \
+       val = paravirt_read_msr_safe(msr, &_err);       \
 } while (0)
 
 static inline void wrmsrl(unsigned msr, u64 val)
@@ -165,23 +166,23 @@ static inline void wrmsrl(unsigned msr, u64 val)
        wrmsr(msr, (u32)val, (u32)(val>>32));
 }
 
-#define wrmsr_safe(msr, a, b)  paravirt_write_msr(msr, a, b)
+#define wrmsr_safe(msr, a, b)  paravirt_write_msr_safe(msr, a, b)
 
 /* rdmsr with exception handling */
-#define rdmsr_safe(msr, a, b)                  \
-({                                             \
-       int _err;                               \
-       u64 _l = paravirt_read_msr(msr, &_err); \
-       (*a) = (u32)_l;                         \
-       (*b) = _l >> 32;                        \
-       _err;                                   \
+#define rdmsr_safe(msr, a, b)                          \
+({                                                     \
+       int _err;                                       \
+       u64 _l = paravirt_read_msr_safe(msr, &_err);    \
+       (*a) = (u32)_l;                                 \
+       (*b) = _l >> 32;                                \
+       _err;                                           \
 })
 
 static inline int rdmsrl_safe(unsigned msr, unsigned long long *p)
 {
        int err;
 
-       *p = paravirt_read_msr(msr, &err);
+       *p = paravirt_read_msr_safe(msr, &err);
        return err;
 }