x86, msr: Unify variable names

Make sure all MSR-accessing primitives which split MSR values in
two 32-bit parts have their variables called 'low' and 'high' for
consistence with the rest of the code and for ease of staring.

Signed-off-by: Borislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1362428180-8865-5-git-send-email-bp@alien8.de
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 9264802e28245fa89fe3a0416d7c99d5326d704b..cb7502852acb0921e4e0c7132962c681f43b51ec 100644 (file)
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -137,11 +137,11 @@ static inline unsigned long long native_read_pmc(int counter)
  * pointer indirection), this allows gcc to optimize better
  */
 
-#define rdmsr(msr, val1, val2)                                 \
+#define rdmsr(msr, low, high)                                  \
 do {                                                           \
        u64 __val = native_read_msr((msr));                     \
-       (void)((val1) = (u32)__val);                            \
-       (void)((val2) = (u32)(__val >> 32));                    \
+       (void)((low) = (u32)__val);                             \
+       (void)((high) = (u32)(__val >> 32));                    \
 } while (0)
 
 static inline void wrmsr(unsigned msr, unsigned low, unsigned high)
@@ -162,12 +162,12 @@ static inline int wrmsr_safe(unsigned msr, unsigned low, unsigned high)
 }
 
 /* rdmsr with exception handling */
-#define rdmsr_safe(msr, p1, p2)                                        \
+#define rdmsr_safe(msr, low, high)                             \
 ({                                                             \
        int __err;                                              \
        u64 __val = native_read_msr_safe((msr), &__err);        \
-       (*p1) = (u32)__val;                                     \
-       (*p2) = (u32)(__val >> 32);                             \
+       (*low) = (u32)__val;                                    \
+       (*high) = (u32)(__val >> 32);                           \
        __err;                                                  \
 })
 
@@ -208,7 +208,7 @@ do {                                                            \
 #define wrmsrl_safe(msr, val) wrmsr_safe((msr), (u32)(val),            \
                                             (u32)((val) >> 32))
 
-#define write_tsc(val1, val2) wrmsr(MSR_IA32_TSC, (val1), (val2))
+#define write_tsc(low, high) wrmsr(MSR_IA32_TSC, (low), (high))
 
 #define write_rdtscp_aux(val) wrmsr(MSR_TSC_AUX, (val), 0)