From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933989AbbDIJDo (ORCPT ); Thu, 9 Apr 2015 05:03:44 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51858 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964788AbbDIJDj (ORCPT ); Thu, 9 Apr 2015 05:03:39 -0400 Date: Thu, 9 Apr 2015 02:03:10 -0700 From: tip-bot for Denys Vlasenko Message-ID: Cc: ast@plumgrid.com, wad@chromium.org, rostedt@goodmis.org, fweisbec@gmail.com, hpa@zytor.com, mingo@kernel.org, brgerst@gmail.com, oleg@redhat.com, torvalds@linux-foundation.org, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, bp@alien8.de, luto@amacapital.net, keescook@chromium.org, tglx@linutronix.de Reply-To: oleg@redhat.com, torvalds@linux-foundation.org, brgerst@gmail.com, rostedt@goodmis.org, ast@plumgrid.com, wad@chromium.org, mingo@kernel.org, fweisbec@gmail.com, hpa@zytor.com, dvlasenk@redhat.com, bp@alien8.de, linux-kernel@vger.kernel.org, tglx@linutronix.de, luto@amacapital.net, keescook@chromium.org In-Reply-To: <1428439424-7258-5-git-send-email-dvlasenk@redhat.com> References: <1428439424-7258-5-git-send-email-dvlasenk@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/64: Remove a redundant jump Git-Commit-ID: a30b0085f54efae11f6256df4e4a16af7eefc1c4 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: a30b0085f54efae11f6256df4e4a16af7eefc1c4 Gitweb: http://git.kernel.org/tip/a30b0085f54efae11f6256df4e4a16af7eefc1c4 Author: Denys Vlasenko AuthorDate: Tue, 7 Apr 2015 22:43:41 +0200 Committer: Ingo Molnar CommitDate: Thu, 9 Apr 2015 10:31:25 +0200 x86/asm/entry/64: Remove a redundant jump Jumping to the very next instruction is not very useful: jmp label label: Removing the jump. Signed-off-by: Denys Vlasenko Cc: Alexei Starovoitov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Steven Rostedt Cc: Thomas Gleixner Cc: Will Drewry Link: http://lkml.kernel.org/r/1428439424-7258-5-git-send-email-dvlasenk@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/entry_64.S | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index ce85256..e8ddd51 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -1448,7 +1448,6 @@ ENTRY(nmi) /* If it is below the NMI stack, it is a normal NMI */ jb first_nmi /* Ah, it is within the NMI stack, treat it as nested */ - jmp nested_nmi CFI_REMEMBER_STATE