diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-09 13:39:02 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 13:39:02 +0400 |
| commit | d028203c0446c7f65ed2b22342a56f03c6c4a6c1 (patch) | |
| tree | 6bd73a5c70b407491dc9d40ecb9e95b48233d004 /include/asm-x86/msr.h | |
| parent | f57e91682d141ea50d8c6d42cdc251b6256a3755 (diff) | |
| parent | 183fe065652dbd64953afa9f389327e23e97967f (diff) | |
| download | linux-d028203c0446c7f65ed2b22342a56f03c6c4a6c1.tar.xz | |
Merge branch 'x86/core' into x86/unify-pci
Diffstat (limited to 'include/asm-x86/msr.h')
| -rw-r--r-- | include/asm-x86/msr.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h index 2b5f2c91db25..ca110ee73f07 100644 --- a/include/asm-x86/msr.h +++ b/include/asm-x86/msr.h @@ -66,7 +66,7 @@ static inline unsigned long long native_read_msr_safe(unsigned int msr, static inline void native_write_msr(unsigned int msr, unsigned low, unsigned high) { - asm volatile("wrmsr" : : "c" (msr), "a"(low), "d" (high)); + asm volatile("wrmsr" : : "c" (msr), "a"(low), "d" (high) : "memory"); } static inline int native_write_msr_safe(unsigned int msr, @@ -81,7 +81,8 @@ static inline int native_write_msr_safe(unsigned int msr, _ASM_EXTABLE(2b, 3b) : "=a" (err) : "c" (msr), "0" (low), "d" (high), - "i" (-EFAULT)); + "i" (-EFAULT) + : "memory"); return err; } |