diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-11 16:46:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-11 16:46:20 -0800 |
| commit | 671d5532aaad777782b66eff71bc4dfad25f942d (patch) | |
| tree | fdd480fbd7bd8078c60e1fe3eea98a8cefb8df67 /arch/x86/include/asm/msr.h | |
| parent | 67c707e451e12f59e57bca6cf33b5803cb74b022 (diff) | |
| parent | 0007bccc3cfd1e69deb0fd73ccc426b4cedb061d (diff) | |
| download | linux-0-day-671d5532aaad777782b66eff71bc4dfad25f942d.tar.gz linux-0-day-671d5532aaad777782b66eff71bc4dfad25f942d.tar.xz | |
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cpu updates from Ingo Molnar:
"The main changes in this cycle were:
- Improved CPU ID handling code and related enhancements (Borislav
Petkov)
- RDRAND fix (Len Brown)"
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Replace RDRAND forced-reseed with simple sanity check
x86/MSR: Chop off lower 32-bit value
x86/cpu: Fix MSR value truncation issue
x86/cpu/amd, kvm: Satisfy guest kernel reads of IC_CFG MSR
kvm: Add accessors for guest CPU's family, model, stepping
x86/cpu: Unify CPU family, model, stepping calculation
Diffstat (limited to 'arch/x86/include/asm/msr.h')
| -rw-r--r-- | arch/x86/include/asm/msr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index fedd6e6d1e439..1e87bff093d13 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -221,7 +221,7 @@ static inline void wrmsr(unsigned msr, unsigned low, unsigned high) static inline void wrmsrl(unsigned msr, u64 val) { - native_write_msr(msr, (u32)val, (u32)(val >> 32)); + native_write_msr(msr, (u32)(val & 0xffffffffULL), (u32)(val >> 32)); } /* wrmsr with exception handling */ |