From: tip-bot for Josh Poimboeuf <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: avagin@virtuozzo.com, linux-kernel@vger.kernel.org,
jpoimboe@redhat.com, tglx@linutronix.de, luto@kernel.org,
mingo@kernel.org, torvalds@linux-foundation.org, hpa@zytor.com,
peterz@infradead.org
Subject: [tip:x86/asm] x86/asm: Don't use the confusing '.ifeq' directive
Date: Mon, 23 Oct 2017 05:44:45 -0700 [thread overview]
Message-ID: <tip-82c62fa0c49aa305104013cee4468772799bb391@git.kernel.org> (raw)
In-Reply-To: <757da028e802c7e98d23fbab8d234b1063e161cf.1508516398.git.jpoimboe@redhat.com>
Commit-ID: 82c62fa0c49aa305104013cee4468772799bb391
Gitweb: https://git.kernel.org/tip/82c62fa0c49aa305104013cee4468772799bb391
Author: Josh Poimboeuf <jpoimboe@redhat.com>
AuthorDate: Fri, 20 Oct 2017 11:21:35 -0500
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 23 Oct 2017 13:31:34 +0200
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: Josh 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: Ingo Molnar <mingo@kernel.org>
---
arch/x86/entry/entry_64.S | 2 +-
arch/x86/kernel/head_32.S | 2 +-
arch/x86/kernel/head_64.S | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index f6cdb7a..846e84a 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -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
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 9ed3074..6e50f87 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -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
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index 42e32c2..311db1a 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -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
next prev parent reply other threads:[~2017-10-23 12:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-20 16:21 [PATCH 1/3] x86/entry: Fix idtentry unwind hint Josh Poimboeuf
2017-10-20 16:21 ` [PATCH 2/3] x86/unwind: Show function name+offset in ORC error messages Josh Poimboeuf
2017-10-23 12:44 ` [tip:x86/asm] " tip-bot for Josh Poimboeuf
2017-10-20 16:21 ` [PATCH 3/3] x86/asm: Don't use the confusing '.ifeq' directive Josh Poimboeuf
2017-10-23 12:44 ` tip-bot for Josh Poimboeuf [this message]
2017-10-23 12:43 ` [tip:x86/asm] x86/entry: Fix idtentry unwind hint tip-bot for Josh Poimboeuf
2017-10-25 21:07 ` [PATCH 1/3] " Andrei Vagin
2017-10-26 15:24 ` Josh Poimboeuf
2017-10-26 16:42 ` Andrei Vagin
2017-11-13 22:06 ` Andrei Vagin
2017-11-13 22:59 ` Josh Poimboeuf
[not found] ` <AM4PR08MB07393706B7D76768D4817AC2CF0C0@AM4PR08MB0739.eurprd08.prod.outlook.com>
2017-12-20 6:34 ` Josh Poimboeuf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-82c62fa0c49aa305104013cee4468772799bb391@git.kernel.org \
--to=tipbot@zytor.com \
--cc=avagin@virtuozzo.com \
--cc=hpa@zytor.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox