From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751986AbbCDWxe (ORCPT ); Wed, 4 Mar 2015 17:53:34 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41873 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751846AbbCDWxb (ORCPT ); Wed, 4 Mar 2015 17:53:31 -0500 Date: Wed, 4 Mar 2015 14:53:03 -0800 From: tip-bot for Denys Vlasenko Message-ID: Cc: oleg@redhat.com, hpa@zytor.com, keescook@chromium.org, ast@plumgrid.com, mingo@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, wad@chromium.org, bp@alien8.de, fweisbec@gmail.com, luto@amacapital.net, tglx@linutronix.de, dvlasenk@redhat.com Reply-To: oleg@redhat.com, hpa@zytor.com, keescook@chromium.org, ast@plumgrid.com, mingo@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, wad@chromium.org, luto@amacapital.net, fweisbec@gmail.com, bp@alien8.de, tglx@linutronix.de, dvlasenk@redhat.com In-Reply-To: References: <1423778052-21038-1-git-send-email-dvlasenk@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/64: Fix incorrect symbolic constant usage: R11->ARGOFFSET Git-Commit-ID: 6e1327bd2b20ccb387fcddc0caa605cb253cc458 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: 6e1327bd2b20ccb387fcddc0caa605cb253cc458 Gitweb: http://git.kernel.org/tip/6e1327bd2b20ccb387fcddc0caa605cb253cc458 Author: Denys Vlasenko AuthorDate: Thu, 26 Feb 2015 14:40:26 -0800 Committer: Ingo Molnar CommitDate: Wed, 4 Mar 2015 22:50:49 +0100 x86/asm/entry/64: Fix incorrect symbolic constant usage: R11->ARGOFFSET Since the last fix of this nature, a few more instances have crept in. Fix them up. No object code changes (constants have the same value). Signed-off-by: Denys Vlasenko Signed-off-by: Andy Lutomirski Cc: Alexei Starovoitov Cc: Borislav Petkov Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Will Drewry Link: http://lkml.kernel.org/r/1423778052-21038-1-git-send-email-dvlasenk@redhat.com Link: http://lkml.kernel.org/r/f5e1c4084319a42e5f14d41e2d638949ce66bc08.1424989793.git.luto@amacapital.net Signed-off-by: Ingo Molnar --- arch/x86/kernel/entry_64.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 10074ad..a57b338 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -757,8 +757,8 @@ retint_swapgs: /* return to user-space */ * Try to use SYSRET instead of IRET if we're returning to * a completely clean 64-bit userspace context. */ - movq (RCX-R11)(%rsp), %rcx - cmpq %rcx,(RIP-R11)(%rsp) /* RCX == RIP */ + movq (RCX-ARGOFFSET)(%rsp), %rcx + cmpq %rcx,(RIP-ARGOFFSET)(%rsp) /* RCX == RIP */ jne opportunistic_sysret_failed /* @@ -779,7 +779,7 @@ retint_swapgs: /* return to user-space */ shr $__VIRTUAL_MASK_SHIFT, %rcx jnz opportunistic_sysret_failed - cmpq $__USER_CS,(CS-R11)(%rsp) /* CS must match SYSRET */ + cmpq $__USER_CS,(CS-ARGOFFSET)(%rsp) /* CS must match SYSRET */ jne opportunistic_sysret_failed movq (R11-ARGOFFSET)(%rsp), %r11