[tip:x86/cleanups] x86, msr: Unify variable names
Commit-ID: 1423bed239415edd1562c25be8a7408858fdbb19
Gitweb: http://git.kernel.org/tip/1423bed239415edd1562c25be8a7408858fdbb19
Author: Borislav Petkov
AuthorDate: Mon, 4 Mar 2013 21:16:19 +0100
Committer: H. Peter Anvin
CommitDate: Tue, 2 Apr 2013 16:03:32 -0700
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
Link: http://lkml.kernel.org/r/1362428180-8865-5-git-send-email...@alien8.de
Signed-off-by: H. Peter Anvin
---
arch/x86/include/asm/msr.h | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 9264802..cb75028 100644
--- 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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[tip:x86/cleanups] x86, msr: Unify variable names
Commit-ID: 1423bed239415edd1562c25be8a7408858fdbb19
Gitweb: http://git.kernel.org/tip/1423bed239415edd1562c25be8a7408858fdbb19
Author: Borislav Petkov b...@suse.de
AuthorDate: Mon, 4 Mar 2013 21:16:19 +0100
Committer: H. Peter Anvin h...@linux.intel.com
CommitDate: Tue, 2 Apr 2013 16:03:32 -0700
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 b...@suse.de
Link: http://lkml.kernel.org/r/1362428180-8865-5-git-send-email...@alien8.de
Signed-off-by: H. Peter Anvin h...@linux.intel.com
---
arch/x86/include/asm/msr.h | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 9264802..cb75028 100644
--- 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)
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
