Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753263AbbDCOIC (ORCPT ); Fri, 3 Apr 2015 10:08:02 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48166 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753178AbbDCOHb (ORCPT ); Fri, 3 Apr 2015 10:07:31 -0400 Date: Fri, 3 Apr 2015 07:07:09 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: torvalds@linux-foundation.org, bp@suse.de, rostedt@goodmis.org, linux-kernel@vger.kernel.org, luto@amacapital.net, fweisbec@gmail.com, oleg@redhat.com, dvlasenk@redhat.com, wad@chromium.org, ast@plumgrid.com, keescook@chromium.org, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com Reply-To: oleg@redhat.com, dvlasenk@redhat.com, wad@chromium.org, ast@plumgrid.com, keescook@chromium.org, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de, torvalds@linux-foundation.org, bp@suse.de, linux-kernel@vger.kernel.org, rostedt@goodmis.org, luto@amacapital.net, fweisbec@gmail.com In-Reply-To: <1428054130-25847-1-git-send-email-bp@alien8.de> References: <1428054130-25847-1-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/64: Fix MSR_IA32_SYSENTER_CS MSR value Git-Commit-ID: 7c74d5b7b7b63fc279ed446ebd78de20d81f2824 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 Content-Length: 2100 Lines: 55 Commit-ID: 7c74d5b7b7b63fc279ed446ebd78de20d81f2824 Gitweb: http://git.kernel.org/tip/7c74d5b7b7b63fc279ed446ebd78de20d81f2824 Author: Borislav Petkov AuthorDate: Fri, 3 Apr 2015 11:42:10 +0200 Committer: Ingo Molnar CommitDate: Fri, 3 Apr 2015 15:29:12 +0200 x86/asm/entry/64: Fix MSR_IA32_SYSENTER_CS MSR value Commit: d56fe4bf5f3c ("x86/asm/entry/64: Always set up SYSENTER MSRs") missed to add "ULL" to the 0 and wrmsrl_safe() complains: arch/x86/kernel/cpu/common.c: In function ‘syscall_init’: arch/x86/kernel/cpu/common.c:1226:2: warning: right shift count >= width of type wrmsrl_safe(MSR_IA32_SYSENTER_CS, 0); Fix it. Signed-off-by: Borislav Petkov Cc: Alexei Starovoitov Cc: Andy Lutomirski Cc: Denys Vlasenko Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Steven Rostedt Cc: Will Drewry Link: http://lkml.kernel.org/r/1428054130-25847-1-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index a383d53..d56d307 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1184,7 +1184,7 @@ void syscall_init(void) wrmsrl_safe(MSR_IA32_SYSENTER_EIP, (u64)ia32_sysenter_target); #else wrmsrl(MSR_CSTAR, ignore_sysret); - wrmsrl_safe(MSR_IA32_SYSENTER_CS, 0); + wrmsrl_safe(MSR_IA32_SYSENTER_CS, 0ULL); wrmsrl_safe(MSR_IA32_SYSENTER_ESP, 0ULL); wrmsrl_safe(MSR_IA32_SYSENTER_EIP, 0ULL); #endif -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/