From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752774AbbCWNbX (ORCPT ); Mon, 23 Mar 2015 09:31:23 -0400 Received: from terminus.zytor.com ([198.137.202.10]:42285 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752548AbbCWNbV (ORCPT ); Mon, 23 Mar 2015 09:31:21 -0400 Date: Mon, 23 Mar 2015 06:30:37 -0700 From: tip-bot for Denys Vlasenko Message-ID: Cc: bp@alien8.de, oleg@redhat.com, mingo@kernel.org, ast@plumgrid.com, torvalds@linux-foundation.org, luto@amacapital.net, keescook@chromium.org, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, tglx@linutronix.de, wad@chromium.org, fweisbec@gmail.com, hpa@zytor.com, rostedt@goodmis.org Reply-To: tglx@linutronix.de, hpa@zytor.com, wad@chromium.org, fweisbec@gmail.com, rostedt@goodmis.org, ast@plumgrid.com, oleg@redhat.com, mingo@kernel.org, bp@alien8.de, torvalds@linux-foundation.org, luto@amacapital.net, keescook@chromium.org, linux-kernel@vger.kernel.org, dvlasenk@redhat.com In-Reply-To: <1427115839-6397-1-git-send-email-dvlasenk@redhat.com> References: <1427115839-6397-1-git-send-email-dvlasenk@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/64: Fix incorrect comment Git-Commit-ID: 34061f134f70d33296fa56678cee122dd7010401 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: 34061f134f70d33296fa56678cee122dd7010401 Gitweb: http://git.kernel.org/tip/34061f134f70d33296fa56678cee122dd7010401 Author: Denys Vlasenko AuthorDate: Mon, 23 Mar 2015 14:03:59 +0100 Committer: Ingo Molnar CommitDate: Mon, 23 Mar 2015 14:28:54 +0100 x86/asm/entry/64: Fix incorrect comment The recent old_rsp -> rsp_scratch rename also changed this comment, but in this case "old_rsp" was not referring to PER_CPU(old_rsp). Fix this. Signed-off-by: Denys Vlasenko Cc: Alexei Starovoitov Cc: Andy Lutomirski Cc: Borislav Petkov 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/1427115839-6397-1-git-send-email-dvlasenk@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/entry_64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 0c91256..9184392 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -657,7 +657,7 @@ common_interrupt: ASM_CLAC addq $-0x80,(%rsp) /* Adjust vector to [-256,-1] range */ interrupt do_IRQ - /* 0(%rsp): rsp_scratch */ + /* 0(%rsp): old RSP */ ret_from_intr: DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF