[Xen-changelog] [xen-unstable] x86: Fix rdmsr_safe after c/s 21600.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1277412565 -3600
# Node ID 1c17f157381e53815ede9168b16a53f83ba57d39
# Parent  b54f9c9f9144f5f2d02a18a4f2841f9c5f361d5b
x86: Fix rdmsr_safe after c/s 21600.

From: Kathy Hadley <Kathy.Hadley@xxxxxxxxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/include/asm-x86/msr.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -r b54f9c9f9144 -r 1c17f157381e xen/include/asm-x86/msr.h
--- a/xen/include/asm-x86/msr.h Wed Jun 23 23:24:42 2010 +0100
+++ b/xen/include/asm-x86/msr.h Thu Jun 24 21:49:25 2010 +0100
@@ -37,7 +37,7 @@ static inline void wrmsrl(unsigned int m
 /* rdmsr with exception handling */
 #define rdmsr_safe(msr,val) ({\
     int _rc; \
-    uint32_t val1, val2; \
+    uint32_t lo, hi; \
     __asm__ __volatile__( \
         "1: rdmsr\n2:\n" \
         ".section .fixup,\"ax\"\n" \
@@ -47,9 +47,9 @@ static inline void wrmsrl(unsigned int m
         "   "__FIXUP_ALIGN"\n" \
         "   "__FIXUP_WORD" 1b,3b\n" \
         ".previous\n" \
-        : "=a" (val1), "=d" (val2), "=&r" (_rc) \
+        : "=a" (lo), "=d" (hi), "=&r" (_rc) \
         : "c" (msr), "2" (0), "i" (-EFAULT)); \
-    val = val2 | ((uint64_t)val1 << 32); \
+    val = lo | ((uint64_t)hi << 32); \
     _rc; })
 
 /* wrmsr with exception handling */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog