Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dde74f2e authored by Denys Vlasenko's avatar Denys Vlasenko Committed by Ingo Molnar
Browse files

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: default avatarDenys Vlasenko <dvlasenk@redhat.com>
Acked-by: default avatarAndy 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: default avatarIngo Molnar <mingo@kernel.org>
parent 5b673a48

arch/x86/kernel/entry_64.S

+4 −4
Original line number Diff line number Diff line
@@ -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