From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752570AbdFMKLw (ORCPT ); Tue, 13 Jun 2017 06:11:52 -0400 Received: from terminus.zytor.com ([65.50.211.136]:39925 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752344AbdFMKLu (ORCPT ); Tue, 13 Jun 2017 06:11:50 -0400 Date: Tue, 13 Jun 2017 03:05:08 -0700 From: "tip-bot for Kirill A. Shutemov" Message-ID: Cc: tglx@linutronix.de, torvalds@linux-foundation.org, akpm@linux-foundation.org, luto@amacapital.net, hpa@zytor.com, brgerst@gmail.com, dave.hansen@intel.com, dvlasenk@redhat.com, mingo@kernel.org, kirill.shutemov@linux.intel.com, linux-kernel@vger.kernel.org, jpoimboe@redhat.com, bp@alien8.de, peterz@infradead.org, luto@kernel.org Reply-To: akpm@linux-foundation.org, tglx@linutronix.de, torvalds@linux-foundation.org, luto@amacapital.net, hpa@zytor.com, brgerst@gmail.com, dave.hansen@intel.com, kirill.shutemov@linux.intel.com, dvlasenk@redhat.com, mingo@kernel.org, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, bp@alien8.de, peterz@infradead.org, luto@kernel.org In-Reply-To: <20170606113133.22974-3-kirill.shutemov@linux.intel.com> References: <20170606113133.22974-3-kirill.shutemov@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/asm: Fix comment in return_from_SYSCALL_64() Git-Commit-ID: cbe0317bf10acf1f41811108ed0f9a316103c0f3 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: cbe0317bf10acf1f41811108ed0f9a316103c0f3 Gitweb: http://git.kernel.org/tip/cbe0317bf10acf1f41811108ed0f9a316103c0f3 Author: Kirill A. Shutemov AuthorDate: Tue, 6 Jun 2017 14:31:21 +0300 Committer: Ingo Molnar CommitDate: Tue, 13 Jun 2017 08:56:51 +0200 x86/asm: Fix comment in return_from_SYSCALL_64() On x86-64 __VIRTUAL_MASK_SHIFT depends on paging mode now. Signed-off-by: Kirill A. Shutemov Cc: Andrew Morton Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-arch@vger.kernel.org Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20170606113133.22974-3-kirill.shutemov@linux.intel.com Signed-off-by: Ingo Molnar --- arch/x86/entry/entry_64.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 4a4c083..a9a8027 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -265,7 +265,8 @@ return_from_SYSCALL_64: * If width of "canonical tail" ever becomes variable, this will need * to be updated to remain correct on both old and new CPUs. * - * Change top 16 bits to be the sign-extension of 47th bit + * Change top bits to match most significant bit (47th or 56th bit + * depending on paging mode) in the address. */ shl $(64 - (__VIRTUAL_MASK_SHIFT+1)), %rcx sar $(64 - (__VIRTUAL_MASK_SHIFT+1)), %rcx