Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752744AbbEHJ1K (ORCPT ); Fri, 8 May 2015 05:27:10 -0400 Received: from terminus.zytor.com ([198.137.202.10]:45326 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752251AbbEHJ0I (ORCPT ); Fri, 8 May 2015 05:26:08 -0400 Date: Fri, 8 May 2015 02:25:26 -0700 From: tip-bot for Denys Vlasenko Message-ID: Cc: bp@alien8.de, linux-kernel@vger.kernel.org, wad@chromium.org, oleg@redhat.com, keescook@chromium.org, dvlasenk@redhat.com, rostedt@goodmis.org, tglx@linutronix.de, mingo@kernel.org, brgerst@gmail.com, fweisbec@gmail.com, torvalds@linux-foundation.org, luto@kernel.org, ast@plumgrid.com, hpa@zytor.com Reply-To: oleg@redhat.com, bp@alien8.de, linux-kernel@vger.kernel.org, wad@chromium.org, keescook@chromium.org, dvlasenk@redhat.com, brgerst@gmail.com, fweisbec@gmail.com, tglx@linutronix.de, mingo@kernel.org, rostedt@goodmis.org, hpa@zytor.com, luto@kernel.org, ast@plumgrid.com, torvalds@linux-foundation.org In-Reply-To: <1430140912-7960-1-git-send-email-dvlasenk@redhat.com> References: <1430140912-7960-1-git-send-email-dvlasenk@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/64: Tidy up JZ insns after TESTs Git-Commit-ID: dde74f2e4a4447ef838c57e407f7139de3df68cb 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 Content-Length: 2380 Lines: 76 Commit-ID: dde74f2e4a4447ef838c57e407f7139de3df68cb Gitweb: http://git.kernel.org/tip/dde74f2e4a4447ef838c57e407f7139de3df68cb Author: Denys Vlasenko AuthorDate: Mon, 27 Apr 2015 15:21:51 +0200 Committer: Ingo Molnar CommitDate: Fri, 8 May 2015 11:07:31 +0200 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 Acked-by: Andy Lutomirski Cc: Alexei Starovoitov 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/1430140912-7960-1-git-send-email-dvlasenk@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/entry_64.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index e952f6b..8f8b22a 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -666,7 +666,7 @@ END(irq_entries_start) leaq -RBP(%rsp),%rdi /* arg1 for \func (pointer to pt_regs) */ testl $3, CS-RBP(%rsp) - je 1f + jz 1f SWAPGS 1: /* @@ -721,7 +721,7 @@ ret_from_intr: CFI_ADJUST_CFA_OFFSET RBP testl $3,CS(%rsp) - je retint_kernel + jz retint_kernel /* Interrupt came from user space */ GET_THREAD_INFO(%rcx) @@ -1310,7 +1310,7 @@ ENTRY(error_entry) SAVE_EXTRA_REGS 8 xorl %ebx,%ebx testl $3,CS+8(%rsp) - je error_kernelspace + jz error_kernelspace error_swapgs: SWAPGS error_sti: @@ -1361,7 +1361,7 @@ ENTRY(error_exit) TRACE_IRQS_OFF GET_THREAD_INFO(%rcx) testl %eax,%eax - jne retint_kernel + jnz retint_kernel LOCKDEP_SYS_EXIT_IRQ movl TI_flags(%rcx),%edx movl $_TIF_WORK_MASK,%edi -- 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/