]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
x86/asm/entry/64: Remove a redundant jump
authorDenys Vlasenko <dvlasenk@redhat.com>
Tue, 7 Apr 2015 20:43:41 +0000 (22:43 +0200)
committerLuis Henriques <luis.henriques@canonical.com>
Mon, 10 Aug 2015 08:54:23 +0000 (09:54 +0100)
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@redhat.com>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Drewry <wad@chromium.org>
Link: http://lkml.kernel.org/r/1428439424-7258-5-git-send-email-dvlasenk@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
arch/x86/kernel/entry_64.S

index c13aaaac878b8b517f4f386f1f9efc1cfdd3b179..c0ec84a1890e855397688b5442c825416f9cff35 100644 (file)
@@ -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