The following commit has been merged into the x86/asm branch of tip: Commit-ID: 07a5d4bcbf8e70a430431991f185eb29e74ae533 Gitweb: https://git.kernel.org/tip/07a5d4bcbf8e70a430431991f185eb29e74ae533 Author: Nikolay Borisov <nik.borisov@xxxxxxxx> AuthorDate: Thu, 22 Feb 2024 13:16:36 +02:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Thu, 22 Feb 2024 12:23:27 +01:00 x86/insn: Directly assign x86_64 state in insn_init() No point in checking again as this was already done by the caller. Signed-off-by: Nikolay Borisov <nik.borisov@xxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20240222111636.2214523-3-nik.borisov@xxxxxxxx --- arch/x86/lib/insn.c | 2 +- tools/arch/x86/lib/insn.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c index 3946bdc..1bb155a 100644 --- a/arch/x86/lib/insn.c +++ b/arch/x86/lib/insn.c @@ -71,7 +71,7 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64) insn->kaddr = kaddr; insn->end_kaddr = kaddr + buf_len; insn->next_byte = kaddr; - insn->x86_64 = x86_64 ? 1 : 0; + insn->x86_64 = x86_64; insn->opnd_bytes = 4; if (x86_64) insn->addr_bytes = 8; diff --git a/tools/arch/x86/lib/insn.c b/tools/arch/x86/lib/insn.c index 5d81924..ada4b4a 100644 --- a/tools/arch/x86/lib/insn.c +++ b/tools/arch/x86/lib/insn.c @@ -71,7 +71,7 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64) insn->kaddr = kaddr; insn->end_kaddr = kaddr + buf_len; insn->next_byte = kaddr; - insn->x86_64 = x86_64 ? 1 : 0; + insn->x86_64 = x86_64; insn->opnd_bytes = 4; if (x86_64) insn->addr_bytes = 8;