summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2015-04-27 09:21:51 -0400
committerIngo Molnar <mingo@kernel.org>2015-05-08 05:07:31 -0400
commitdde74f2e4a4447ef838c57e407f7139de3df68cb (patch)
tree83e313f73d8684ac57529aedf7830704a857ff8a
parent5b673a48c54594108aec368014efc7334743f06a (diff)
x86/asm/entry/64: Tidy up JZ insns after TESTs
After TESTs, use logically correct JZ/JNZ mnemonics instead of JE/JNE. This doesn't change code. Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com> Acked-by: Andy Lutomirski <luto@kernel.org> Cc: Alexei Starovoitov <ast@plumgrid.com> 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/1430140912-7960-1-git-send-email-dvlasenk@redhat.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/kernel/entry_64.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index e952f6bf1d6d..8f8b22a361df 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -666,7 +666,7 @@ END(irq_entries_start)
666 leaq -RBP(%rsp),%rdi /* arg1 for \func (pointer to pt_regs) */ 666 leaq -RBP(%rsp),%rdi /* arg1 for \func (pointer to pt_regs) */
667 667
668 testl $3, CS-RBP(%rsp) 668 testl $3, CS-RBP(%rsp)
669 je 1f 669 jz 1f
670 SWAPGS 670 SWAPGS
6711: 6711:
672 /* 672 /*
@@ -721,7 +721,7 @@ ret_from_intr:
721 CFI_ADJUST_CFA_OFFSET RBP 721 CFI_ADJUST_CFA_OFFSET RBP
722 722
723 testl $3,CS(%rsp) 723 testl $3,CS(%rsp)
724 je retint_kernel 724 jz retint_kernel
725 /* Interrupt came from user space */ 725 /* Interrupt came from user space */
726 726
727 GET_THREAD_INFO(%rcx) 727 GET_THREAD_INFO(%rcx)
@@ -1310,7 +1310,7 @@ ENTRY(error_entry)
1310 SAVE_EXTRA_REGS 8 1310 SAVE_EXTRA_REGS 8
1311 xorl %ebx,%ebx 1311 xorl %ebx,%ebx
1312 testl $3,CS+8(%rsp) 1312 testl $3,CS+8(%rsp)
1313 je error_kernelspace 1313 jz error_kernelspace
1314error_swapgs: 1314error_swapgs:
1315 SWAPGS 1315 SWAPGS
1316error_sti: 1316error_sti:
@@ -1361,7 +1361,7 @@ ENTRY(error_exit)
1361 TRACE_IRQS_OFF 1361 TRACE_IRQS_OFF
1362 GET_THREAD_INFO(%rcx) 1362 GET_THREAD_INFO(%rcx)
1363 testl %eax,%eax 1363 testl %eax,%eax
1364 jne retint_kernel 1364 jnz retint_kernel
1365 LOCKDEP_SYS_EXIT_IRQ 1365 LOCKDEP_SYS_EXIT_IRQ
1366 movl TI_flags(%rcx),%edx 1366 movl TI_flags(%rcx),%edx
1367 movl $_TIF_WORK_MASK,%edi 1367 movl $_TIF_WORK_MASK,%edi