From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932152AbbFEANw (ORCPT ); Thu, 4 Jun 2015 20:13:52 -0400 Received: from mail.kernel.org ([198.145.29.136]:60892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752230AbbFEANu (ORCPT ); Thu, 4 Jun 2015 20:13:50 -0400 From: Andy Lutomirski To: x86@kernel.org Cc: "linux-kernel@vger.kernel.org" , Borislav Petkov , Andy Lutomirski Subject: [PATCH] x86/msr: Make wrmsrl_safe a function Date: Thu, 4 Jun 2015 17:13:44 -0700 Message-Id: <5900e4d77e9826494ff49cc4adb6bbe9b46e8bba.1433463184.git.luto@kernel.org> X-Mailer: git-send-email 2.4.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/x86/include/asm/msr.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index de36f22eb0b9..4c576877396c 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -205,8 +205,10 @@ do { \ #endif /* !CONFIG_PARAVIRT */ -#define wrmsrl_safe(msr, val) wrmsr_safe((msr), (u32)(val), \ - (u32)((val) >> 32)) +static inline int wrmsrl_safe(unsigned msr, u64 val) +{ + return wrmsr_safe((msr), (u32)val, (u32)(val >> 32)); +} #define write_tsc(low, high) wrmsr(MSR_IA32_TSC, (low), (high)) -- 2.4.2