diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-06-24 21:49:25 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-06-24 21:49:25 +0100 |
| commit | f8decb68bf79927cba503f8335c685b49424165e (patch) | |
| tree | d7cf0bc66b6a24dfe7a9ca8669e66f16150f29a4 /xen/include/asm-x86/msr.h | |
| parent | fde661bff917bfce00b7b16d999f5d937f24e75b (diff) | |
| download | xen-f8decb68bf79927cba503f8335c685b49424165e.tar.gz xen-f8decb68bf79927cba503f8335c685b49424165e.tar.bz2 xen-f8decb68bf79927cba503f8335c685b49424165e.zip | |
x86: Fix rdmsr_safe after c/s 21600.
From: Kathy Hadley <Kathy.Hadley@dornerworks.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/include/asm-x86/msr.h')
| -rw-r--r-- | xen/include/asm-x86/msr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xen/include/asm-x86/msr.h b/xen/include/asm-x86/msr.h index 820a2528e6..d55c81509b 100644 --- a/xen/include/asm-x86/msr.h +++ b/xen/include/asm-x86/msr.h @@ -37,7 +37,7 @@ static inline void wrmsrl(unsigned int msr, __u64 val) /* 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 msr, __u64 val) " "__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 */ |