From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754257AbbFEIoi (ORCPT ); Fri, 5 Jun 2015 04:44:38 -0400 Received: from terminus.zytor.com ([198.137.202.10]:55979 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753964AbbFEIoe (ORCPT ); Fri, 5 Jun 2015 04:44:34 -0400 Date: Fri, 5 Jun 2015 01:42:56 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: peterz@infradead.org, torvalds@linux-foundation.org, luto@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, akpm@linux-foundation.org Reply-To: torvalds@linux-foundation.org, luto@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, akpm@linux-foundation.org To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/msr: Make wrmsrl_safe() a function Git-Commit-ID: cf991de2f614f454b3cb2a300c06ecdf69f3a70d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: cf991de2f614f454b3cb2a300c06ecdf69f3a70d Gitweb: http://git.kernel.org/tip/cf991de2f614f454b3cb2a300c06ecdf69f3a70d Author: Andy Lutomirski AuthorDate: Thu, 4 Jun 2015 17:13:44 -0700 Committer: Ingo Molnar CommitDate: Fri, 5 Jun 2015 09:41:22 +0200 x86/asm/msr: Make wrmsrl_safe() a function The wrmsrl_safe macro performs invalid shifts if the value argument is 32 bits. This makes it unnecessarily awkward to write code that puts an unsigned long into an MSR. Convert it to a real inline function. For inspiration, see: 7c74d5b7b7b6 ("x86/asm/entry/64: Fix MSR_IA32_SYSENTER_CS MSR value"). Signed-off-by: Andy Lutomirski Cc: Cc: Andrew Morton Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner [ Applied small improvements. ] Signed-off-by: Ingo Molnar --- arch/x86/include/asm/msr.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index de36f22..13bf576 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -205,8 +205,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))