[PATCH 3.13.y-ckt 02/53] x86/asm/entry/64: Remove a redundant jump

[Kamal Mostafa]

3.13.11-ckt25 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Denys Vlasenko <dvlasenk at redhat.com>

commit a30b0085f54efae11f6256df4e4a16af7eefc1c4 upstream.

Jumping to the very next instruction is not very useful:

        jmp label
    label:

Removing the jump.

Signed-off-by: Denys Vlasenko <dvlasenk at redhat.com>
Cc: Alexei Starovoitov <ast at plumgrid.com>
Cc: Andy Lutomirski <luto at amacapital.net>
Cc: Borislav Petkov <bp at alien8.de>
Cc: Brian Gerst <brgerst at gmail.com>
Cc: Frederic Weisbecker <fweisbec at gmail.com>
Cc: H. Peter Anvin <hpa at zytor.com>
Cc: Kees Cook <keescook at chromium.org>
Cc: Linus Torvalds <torvalds at linux-foundation.org>
Cc: Oleg Nesterov <oleg at redhat.com>
Cc: Steven Rostedt <rostedt at goodmis.org>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Will Drewry <wad at chromium.org>
Link: http://lkml.kernel.org/r/1428439424-7258-5-git-send-email-dvlasenk@redhat.com
Signed-off-by: Ingo Molnar <mingo at kernel.org>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
Acked-by: John Johansen <john.johansen at canonical.com>
Acked-by: Andy Whitcroft <apw at canonical.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
Signed-off-by: Andy Whitcroft <apw at canonical.com>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 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 f4c0444..ed0f923 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -1777,7 +1777,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
 
-- 
1.9.1