diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-06-08 20:48:01 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-06-08 20:48:20 +0200 |
commit | 9dda1658a9bd450d65da5153a2427955785d17c2 (patch) | |
tree | c563b728d879c2b446a8f1c33ce351ffb1f1d34e /arch/x86/include/asm/msr.h | |
parent | b72e7464e4cf80117938e6adb8c22fdc1ca46d42 (diff) | |
parent | a49976d14f780942dafafbbf16f891c27d385ea0 (diff) | |
download | linux-stable-9dda1658a9bd450d65da5153a2427955785d17c2.tar.gz linux-stable-9dda1658a9bd450d65da5153a2427955785d17c2.tar.bz2 linux-stable-9dda1658a9bd450d65da5153a2427955785d17c2.zip |
Merge branch 'x86/asm' into x86/core, to prepare for new patch
Collect all changes to arch/x86/entry/entry_64.S, before applying
patch that changes most of the file.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/msr.h')
-rw-r--r-- | arch/x86/include/asm/msr.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 441ecf83d81a..e6a707eb5081 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -206,8 +206,13 @@ do { \ #endif /* !CONFIG_PARAVIRT */ -#define wrmsrl_safe(msr, val) wrmsr_safe((msr), (u32)(val), \ - (u32)((val) >> 32)) +/* + * 64-bit version of wrmsr_safe(): + */ +static inline int wrmsrl_safe(u32 msr, u64 val) +{ + return wrmsr_safe(msr, (u32)val, (u32)(val >> 32)); +} #define write_tsc(low, high) wrmsr(MSR_IA32_TSC, (low), (high)) |