From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758293AbcIPJRt (ORCPT ); Fri, 16 Sep 2016 05:17:49 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37040 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757556AbcIPJRg (ORCPT ); Fri, 16 Sep 2016 05:17:36 -0400 Date: Fri, 16 Sep 2016 02:16:27 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: tglx@linutronix.de, bp@alien8.de, jann@thejh.net, brgerst@gmail.com, torvalds@linux-foundation.org, jpoimboe@redhat.com, dvlasenk@redhat.com, mingo@kernel.org, peterz@infradead.org, hpa@zytor.com, luto@kernel.org, linux-kernel@vger.kernel.org Reply-To: luto@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, peterz@infradead.org, dvlasenk@redhat.com, jpoimboe@redhat.com, torvalds@linux-foundation.org, mingo@kernel.org, bp@alien8.de, tglx@linutronix.de, brgerst@gmail.com, jann@thejh.net In-Reply-To: <089fe1e1cbe8b258b064fccbb1a5a5fd23861031.1474003868.git.luto@kernel.org> References: <089fe1e1cbe8b258b064fccbb1a5a5fd23861031.1474003868.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/entry/64: Fix a minor comment rebase error Git-Commit-ID: ff0071c03684485495e06f3936399eb9c93141a6 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 Archived-At: List-Archive: List-Post: Commit-ID: ff0071c03684485495e06f3936399eb9c93141a6 Gitweb: http://git.kernel.org/tip/ff0071c03684485495e06f3936399eb9c93141a6 Author: Andy Lutomirski AuthorDate: Thu, 15 Sep 2016 22:45:42 -0700 Committer: Ingo Molnar CommitDate: Fri, 16 Sep 2016 09:18:52 +0200 x86/entry/64: Fix a minor comment rebase error When I rebased my thread_info changes onto Brian's switch_to() changes, I carefully checked that I fixed up all the code correctly, but I missed a comment :( Signed-off-by: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Jann Horn Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Fixes: 15f4eae70d36 ("x86: Move thread_info into task_struct") Link: http://lkml.kernel.org/r/089fe1e1cbe8b258b064fccbb1a5a5fd23861031.1474003868.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/entry/entry_64.S | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 2b46384..80ab68a 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -372,7 +372,6 @@ END(ptregs_\func) /* * %rdi: prev task * %rsi: next task - * rsi: task we're switching to */ ENTRY(__switch_to_asm) /*