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

Commit 82c62fa0 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Ingo Molnar
Browse files

x86/asm: Don't use the confusing '.ifeq' directive 



I find the '.ifeq <expression>' directive to be confusing.  Reading it
quickly seems to suggest its opposite meaning, or that it's missing an
argument.

Improve readability by replacing all of its x86 uses with
'.if <expression> == 0'.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Cc: Andrei Vagin <avagin@virtuozzo.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/757da028e802c7e98d23fbab8d234b1063e161cf.1508516398.git.jpoimboe@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent bae95255

arch/x86/entry/entry_64.S

+1 −1
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ ENTRY(\sym) 


	ASM_CLAC



	.ifeq \has_error_code

	.if \has_error_code == 0

	pushq	$-1				/* ORIG_RAX: no syscall to restart */

	.endif

arch/x86/kernel/head_32.S

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ ENTRY(early_idt_handler_array) 
	# 24(%rsp) error code

	i = 0

	.rept NUM_EXCEPTION_VECTORS

	.ifeq (EXCEPTION_ERRCODE_MASK >> i) & 1

	.if ((EXCEPTION_ERRCODE_MASK >> i) & 1) == 0

	pushl $0		# Dummy error code, to make stack frame uniform

	.endif

	pushl $i		# 20(%esp) Vector number

arch/x86/kernel/head_64.S

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ ENDPROC(start_cpu0) 
ENTRY(early_idt_handler_array)

	i = 0

	.rept NUM_EXCEPTION_VECTORS

	.ifeq (EXCEPTION_ERRCODE_MASK >> i) & 1

	.if ((EXCEPTION_ERRCODE_MASK >> i) & 1) == 0

		UNWIND_HINT_IRET_REGS

		pushq $0	# Dummy error code, to make stack frame uniform

	.else