Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933785AbbHLJK4 (ORCPT ); Wed, 12 Aug 2015 05:10:56 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:60968 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964898AbbHLI6c (ORCPT ); Wed, 12 Aug 2015 04:58:32 -0400 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Denys Vlasenko , Alexei Starovoitov , Andy Lutomirski , Borislav Petkov , Brian Gerst , Frederic Weisbecker , "H. Peter Anvin" , Kees Cook , Linus Torvalds , Oleg Nesterov , Steven Rostedt , Thomas Gleixner , Will Drewry , Ingo Molnar , Ben Hutchings , Luis Henriques Subject: [PATCH 3.16.y-ckt 049/118] x86/asm/entry/64: Remove a redundant jump Date: Wed, 12 Aug 2015 09:55:51 +0100 Message-Id: <1439369820-27005-50-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1439369820-27005-1-git-send-email-luis.henriques@canonical.com> References: <1439369820-27005-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1785 Lines: 53 3.16.7-ckt16 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Denys Vlasenko commit a30b0085f54efae11f6256df4e4a16af7eefc1c4 upstream. 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 Signed-off-by: Ben Hutchings Signed-off-by: Luis Henriques --- 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 c13aaaac878b..c0ec84a1890e 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -1494,7 +1494,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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/