The following commit has been merged into the perf/core branch of tip:
Commit-ID: 3c48808408af11d6f173c65eee9bd5ca4c53667c
Gitweb: https://git.kernel.org/tip/3c48808408af11d6f173c65eee9bd5ca4c53667c
Author: Jens Remus <jremus@linux.ibm.com>
AuthorDate: Mon, 08 Dec 2025 17:03:52 +01:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 17 Dec 2025 13:31:08 +01:00
x86/unwind_user: Simplify unwind_user_word_size()
Get rid of superfluous ifdef and return explicit word size depending on
32-bit or 64-bit mode.
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jens Remus <jremus@linux.ibm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://patch.msgid.link/20251208160352.1363040-5-jremus@linux.ibm.com
---
arch/x86/include/asm/unwind_user.h | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/arch/x86/include/asm/unwind_user.h b/arch/x86/include/asm/unwind_user.h
index 7f1229b..6e46904 100644
--- a/arch/x86/include/asm/unwind_user.h
+++ b/arch/x86/include/asm/unwind_user.h
@@ -12,11 +12,7 @@ static inline int unwind_user_word_size(struct pt_regs *regs)
/* We can't unwind VM86 stacks */
if (regs->flags & X86_VM_MASK)
return 0;
-#ifdef CONFIG_X86_64
- if (!user_64bit_mode(regs))
- return sizeof(int);
-#endif
- return sizeof(long);
+ return user_64bit_mode(regs) ? 8 : 4;
}
#endif /* CONFIG_UNWIND_USER */